diff --git a/lisp/org.el b/lisp/org.el
index 316526a64..73e39f8e2 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5205,8 +5205,6 @@ The following commands are available:
   ;; Calc embedded
   (org-set-local 'calc-embedded-open-mode "# ")
   ;; Modify a few syntax entries
-  (modify-syntax-entry ?< "(")
-  (modify-syntax-entry ?> ")")
   (modify-syntax-entry ?{ "(")
   (modify-syntax-entry ?} ")")
   (modify-syntax-entry ?@ "w")
@@ -5233,8 +5231,8 @@ The following commands are available:
   ;; Comments.
   (org-setup-comments-handling)
   ;; Beginning/end of defun
-  (org-set-local 'beginning-of-defun-function 'org-back-to-heading)
-  (org-set-local 'end-of-defun-function (lambda () (interactive) (org-end-of-subtree nil t)))
+  (org-set-local 'beginning-of-defun-function 'org-backward-element)
+  (org-set-local 'end-of-defun-function 'org-forward-element)
   ;; Next error for sparse trees
   (org-set-local 'next-error-function 'org-occur-next-match)
   ;; Make sure dependence stuff works reliably, even for users who set it