diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37e9a9284cfeb26aac79a3df90ce589fc8a8878d..c16ce2153d43d0dc018d1d07f48a04d703791722 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,7 @@
-2009-04-06  Chong Yidong  <cyd@stupidchicken.com>
+2009-04-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* descr-text.el (describe-property-list, describe-char): Add
+	follow-link properties to buttons that need them.
 
 	* tooltip.el (tooltip-show-help-non-mode): Don't save the last
 	message if it was also a help message (Bug#2895).
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 5234a4f9a9ac8963cda1e1006349db79f3e230d5..b559a1391fd683eafbd440d1b59e8e18aa43780b 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -84,6 +84,7 @@ into help buttons that call `describe-text-category' or
 	      (symbol-name value)
 	      'action `(lambda (&rest ignore)
 			 (describe-text-category ',value))
+	      'follow-link t
 	      'help-echo "mouse-2, RET: describe this category"))
             ((memq key '(face font-lock-face mouse-face))
 	     (insert-text-button
@@ -513,6 +514,7 @@ as well as widgets, buttons, overlays, and text properties."
 				    (if (search-forward ,(char-to-string char)
 							nil t)
 					(goto-char (match-beginning 0))))))
+		      'follow-link t
 		      'help-echo
 		      "mouse-2, RET: show this character in its character set")
 		  str)))
@@ -727,7 +729,8 @@ as well as widgets, buttons, overlays, and text properties."
 	   "customize what to show"
 	   'action (lambda (&rest ignore)
 		     (customize-variable
-		      'describe-char-unidata-list)))
+		      'describe-char-unidata-list))
+	   'follow-link t)
 	  (insert "\n")
 	  (dolist (elt (if (eq describe-char-unidata-list t)
 			   (nreverse (mapcar 'car char-code-property-alist))