diff --git a/README.md b/README.md
index 50f78d9..5d2274c 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,7 @@ Keybinding         | Description
 <kbd>C-h A</kbd>   | Run `apropos` (search in all Emacs symbols).
 <kbd>M-/</kbd>     | Run `hippie-expand` (a replacement for the default `dabbrev-expand`).
 <kbd>C-x C-b</kbd> | Open `ibuffer` (a replacement for the default `buffer-list`).
+<kbd>F11</kbd>     | Make the window full screen.
 <kbd>F12</kbd>     | Toggle the Emacs menu bar.
 <kbd>C-x g</kbd>   | Open Magit's status buffer.
 <kbd>C-=</kbd>     | Run `expand-region` (incremental text selection).
diff --git a/core/prelude-core.el b/core/prelude-core.el
index 1962e20..026ca2c 100644
--- a/core/prelude-core.el
+++ b/core/prelude-core.el
@@ -514,5 +514,17 @@ With numeric prefix arg DEC, decrement the integer by DEC amount."
   (interactive "p")
   (prelude-increment-integer-at-point (- (or dec 1))))
 
+;;; Emacs in OSX already has fullscreen support
+(when (eq window-system 'x)
+  (defun prelude-fullscreen ()
+    "Makes Emacs window fullscreen.
+
+This follows freedesktop standards, should work in X servers."
+    (interactive)
+    (x-send-client-message nil 0 nil "_NET_WM_STATE" 32
+                           '(2 "_NET_WM_STATE_FULLSCREEN" 0)))
+  (global-set-key (kbd "<f11>") 'prelude-fullscreen)
+)
+
 (provide 'prelude-core)
 ;;; prelude-core.el ends here