diff --git a/core/prelude-osx.el b/core/prelude-osx.el
index ba0db17..0a83781 100644
--- a/core/prelude-osx.el
+++ b/core/prelude-osx.el
@@ -40,7 +40,8 @@
 
 ;; It's all in the Meta
 (setq mac-command-modifier 'meta)
-(setq mac-option-modifier 'meta)
+(setq mac-option-modifier 'super)
+(setq ns-function-modifier 'hyper)
 
 (defun prelude-swap-meta-and-super ()
   "Swap the mapping of Meta and Super.