diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1c086c62..832b52fc1 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-07  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-exp.el (org-export-normalize-links): If the link is also
+	used as the description, protect the description.
+
 2009-01-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-closest-date): Fix bug with yearly repeats, in
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 4f27bf705..46cc73ce3 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2054,7 +2054,10 @@ When it is nil, all comments will be removed."
 		  "[[" xx "]"
 		  (if (match-end 3)
 		      (match-string 2)
-		    (concat "[" xx "]"))
+		    (concat "[" (org-add-props
+				    (copy-sequence xx)
+				    '(org-protected t))
+			    "]"))
 		  "]")))
 	 (put-text-property 0 (length s) 'face 'org-link s)
 	 (replace-match s t t))))))