diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index a5f493fa..5847b094 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -7,6 +7,12 @@
 (setq custom-file "~/.emacs.d/custom-before.el")
 (when (file-exists-p custom-file) (load custom-file))
 
+;; If this isn't here and there's a problem with init, graphical emacs
+;; is super annoying.
+(when (equal system-type 'darwin)
+  (setq mac-option-modifier 'meta)
+  (setq mac-command-modifier 'super))
+
 (org-babel-load-file
  (concat (file-name-directory load-file-name) "README.org"))