diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 961e60f94..616e1a7e1 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-exp.el (org-export-get-coderef-format): Use the description
+	is present.
+
 	* org.el (org-sort-entries-or-items): Improve docstring, and make
 	better implementation for time sorting.
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 47f7c7dea..71781187f 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2576,7 +2576,7 @@ stacked delimiters is N.  Escaping delimiters is not possible."
 		   (regexp-quote (concat "(" path ")"))
 		   desc))
 	(replace-match "%s" t t desc)
-      "%s")))
+      (or desc "%s"))))
 
 (provide 'org-exp)
 
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 6ae938e65..3feb12cd8 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -965,7 +965,6 @@ lang=\"%s\" xml:lang=\"%s\">
 				"</a>")))
 
 	     ((string= type "coderef")
-
 	      (setq rpl (format "<a href=\"#coderef-%s\" class=\"coderef\" onmouseover=\"CodeHighlightOn(this, 'coderef-%s');\" onmouseout=\"CodeHighlightOff(this, 'coderef-%s');\">%s</a>"
 				path path path
 				(format (org-export-get-coderef-format path (and descp desc))