diff --git a/ChangeLog b/ChangeLog
index 502d0c3df..fca26f0ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
 	(org-agenda-get-deadlines): Pass wdays to
 	`org-agenda-deadline-face'.
 	(org-agenda-align-tags): Bug fix.
+	(org-mouse-1-follows-link): Backwards compatibility.
 
 2008-02-28  Bastien Guerry  <bzg@altern.org>
 
diff --git a/org.el b/org.el
index 0913c5234..f8c581a19 100644
--- a/org.el
+++ b/org.el
@@ -1255,7 +1255,8 @@ Needs to be set before org.el is loaded."
   :group 'org-link-follow
   :type 'boolean)
 
-(defcustom org-mouse-1-follows-link mouse-1-click-follows-link
+(defcustom org-mouse-1-follows-link 
+  (if (boundp 'mouse-1-click-follows-link) mouse-1-click-follows-link t)
   "Non-nil means, mouse-1 on a link will follow the link.
 A longer mouse click will still set point.  Does not work on XEmacs.
 Needs to be set before org.el is loaded."