diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 06f66ffca..a9be175cd 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1759,11 +1759,11 @@ The following commands are available:
   (org-add-hook 'post-command-hook 'org-agenda-post-command-hook nil 'local)
   (org-add-hook 'pre-command-hook 'org-unhighlight nil 'local)
   ;; Make sure properties are removed when copying text
-  (when (boundp 'filter-buffer-substring-functions)
-    (org-set-local 'filter-buffer-substring-functions
+  (when (boundp 'buffer-substring-filters)
+    (org-set-local 'buffer-substring-filters
 		   (cons (lambda (x)
                            (set-text-properties 0 (length x) nil x) x)
-			 filter-buffer-substring-functions)))
+			 buffer-substring-filters)))
   (unless org-agenda-keep-modes
     (setq org-agenda-follow-mode org-agenda-start-with-follow-mode
 	  org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index 7fa8e16cd..095e9ca25 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -157,8 +157,8 @@ FIXME:  How to update when broken?"
       (org-set-local 'org-hide-leading-stars-before-indent-mode
 		     org-hide-leading-stars)
       (org-set-local 'org-hide-leading-stars t))
-    (make-local-variable 'filter-buffer-substring-functions)
-    (add-to-list 'filter-buffer-substring-functions
+    (make-local-variable 'buffer-substring-filters)
+    (add-to-list 'buffer-substring-filters
 		 'org-indent-remove-properties-from-string)
     (org-add-hook 'org-after-demote-entry-hook
 		  'org-indent-refresh-section nil 'local)
@@ -177,9 +177,9 @@ FIXME:  How to update when broken?"
 	(when (boundp 'org-hide-leading-stars-before-indent-mode)
 	  (org-set-local 'org-hide-leading-stars
 			 org-hide-leading-stars-before-indent-mode))
-	(setq filter-buffer-substring-functions
+	(setq buffer-substring-filters
 	      (delq 'org-indent-remove-properties-from-string
-		    filter-buffer-substring-functions))
+		    buffer-substring-filters))
 	(remove-hook 'org-after-promote-entry-hook
 		     'org-indent-refresh-section 'local)
 	(remove-hook 'org-after-demote-entry-hook