diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e60c91e1..ea7ea5461 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-05  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-target-link-regexp): Make buffer-local.
+
 2008-12-04  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-faces.el (org-set-tag-faces): New function.
diff --git a/lisp/org.el b/lisp/org.el
index 134981ef0..294b1d994 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3721,6 +3721,7 @@ will be prompted for."
 
 (defvar org-target-link-regexp nil
   "Regular expression matching radio targets in plain text.")
+(make-variable-buffer-local 'org-target-link-regexp)
 (defvar org-target-regexp "<<\\([^<>\n\r]+\\)>>"
   "Regular expression matching a link target.")
 (defvar org-radio-target-regexp "<<<\\([^<>\n\r]+\\)>>>"