diff --git a/core/prelude-core.el b/core/prelude-core.el
index b0f2b90..355f5cd 100644
--- a/core/prelude-core.el
+++ b/core/prelude-core.el
@@ -90,14 +90,16 @@ Position the cursor at its beginning, according to the current mode."
   "Move up the current line."
   (interactive)
   (transpose-lines 1)
-  (forward-line -2))
+  (forward-line -2)
+  (indent-according-to-mode))
 
 (defun prelude-move-line-down ()
   "Move down the current line."
   (interactive)
   (forward-line 1)
   (transpose-lines 1)
-  (forward-line -1))
+  (forward-line -1)
+  (indent-according-to-mode))
 
 (defun prelude-indent-buffer ()
   "Indent the currently visited buffer."
diff --git a/core/prelude-mode.el b/core/prelude-mode.el
index 17aa6fb..40d7c59 100644
--- a/core/prelude-mode.el
+++ b/core/prelude-mode.el
@@ -41,6 +41,8 @@
     (define-key map [(shift return)] 'prelude-smart-open-line)
     (define-key map [(control shift up)]  'prelude-move-line-up)
     (define-key map [(control shift down)]  'prelude-move-line-down)
+    (define-key map [(meta shift up)]  'prelude-move-line-up)
+    (define-key map [(meta shift down)]  'prelude-move-line-down)
     (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)