diff --git a/core/prelude-core.el b/core/prelude-core.el
index 2545f67..b0f2b90 100644
--- a/core/prelude-core.el
+++ b/core/prelude-core.el
@@ -116,6 +116,13 @@ Position the cursor at its beginning, according to the current mode."
         (prelude-indent-buffer)
         (message "Indented buffer.")))))
 
+(defun prelude-indent-defun ()
+  "Indent the current defun."
+  (interactive)
+  (save-excursion
+    (mark-defun)
+    (indent-region (region-beginning) (region-end))))
+
 (defun prelude-annotate-todo ()
   "Put fringe marker on TODO: lines in the curent buffer."
   (interactive)
diff --git a/core/prelude-mode.el b/core/prelude-mode.el
index 8267bfb..1f7d27c 100644
--- a/core/prelude-mode.el
+++ b/core/prelude-mode.el
@@ -44,6 +44,7 @@
     (define-key map (kbd "C-c n") 'prelude-cleanup-buffer)
     (define-key map (kbd "C-c f")  'prelude-recentf-ido-find-file)
     (define-key map (kbd "C-M-\\") 'prelude-indent-region-or-buffer)
+    (define-key map (kbd "C-M-z") 'indent-defun)
     (define-key map (kbd "C-c u") 'prelude-view-url)
     (define-key map (kbd "C-c e") 'prelude-eval-and-replace)
     (define-key map (kbd "C-c s") 'prelude-swap-windows)