diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6b2acf00..adfd713d8 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-05  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org-exp.el (org-export-preprocess-string): Swap link
+	normalization and inernal link targeting.
+
 	* org-publish.el (org-publish-needed-p): Create timestamp
 	directory when it does not exist.
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 119a58201..e629eeffa 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1415,15 +1415,15 @@ on this string to produce the exported version."
       ;; Find all links that contain a newline and put them into a single line
       (org-export-concatenate-multiline-links)
 
+      ;; Normalize links: Convert angle and plain links into bracket links
+      ;; and expand link abbreviations
+      (org-export-normalize-links)
+
       ;; Find all internal links.  If they have a fuzzy match (i.e. not
       ;; a *dedicated* target match, let the link  point to the
       ;; corresponding section.
       (org-export-target-internal-links target-alist)
 
-      ;; Normalize links: Convert angle and plain links into bracket links
-      ;; and expand link abbreviations
-      (org-export-normalize-links)
-
       ;; Find multiline emphasis and put them into single line
       (when (plist-get parameters :emph-multiline)
 	(org-export-concatenate-multiline-emphasis))