diff --git a/init.el b/init.el
index 282eaab..4cc8db8 100644
--- a/init.el
+++ b/init.el
@@ -345,7 +345,9 @@
    ("c" . org-capture)
    :map org-mode-map
    ("SPC" . org-space-key)
-   ("C-c l" . org-toggle-link-display)))
+   ("C-c l" . org-toggle-link-display)
+   ("C-a" . gpolonkai/move-to-beginning-of-line)
+   ("C-e" . gpolonkai/move-to-end-of-line)))
 
 (use-package org-bullets
   :ensure t
diff --git a/lisp/buf-manipulation.el b/lisp/buf-manipulation.el
index bc66458..54427ec 100644
--- a/lisp/buf-manipulation.el
+++ b/lisp/buf-manipulation.el
@@ -145,6 +145,9 @@ http://emacsredux.com/blog/2013/05/22/smarter-navigation-to-the-beginning-of-a-l
       (back-to-indentation))
     (when (= (point) last-pos)
       (beginning-of-line))
+    (when (and (eq major-mode 'org-mode)
+               (= (point) last-pos))
+      (org-beginning-of-line))
     (when (= (point) last-pos)
       (back-to-indentation))))
 
@@ -157,4 +160,7 @@ http://emacsredux.com/blog/2013/05/22/smarter-navigation-to-the-beginning-of-a-l
     (when visual-line-mode
       (end-of-visual-line))
     (when (= (point) last-pos)
-      (end-of-line))))
+      (end-of-line))
+    (when (and (eq major-mode 'org-mode)
+               (= (point) last-pos))
+      (org-end-of-line))))