diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98d46e68c..13570ea8f 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-05  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-offer-links-in-entry): Fix bug when there is a
+	single link.
+
 	* org-exp.el (org-export): Make sure the mark is activated, also
 	when `transient-mark-mode' is off.
 
diff --git a/lisp/org.el b/lisp/org.el
index 75ddcd140..34a60a7f2 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8564,7 +8564,7 @@ there is one, offer it as link number zero."
      ((null links)
       (message "No links"))
      ((equal (length links) 1)
-      (setq link (car links)))
+      (setq link (list (car links))))
      ((and (integerp nth) (>= (length links) (if have-zero (1+ nth) nth)))
       (setq link (nth (if have-zero nth (1- nth)) links)))
      (t ; we have to select a link