diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 142e6bc57e0..8c978e2b33c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-04  Juanma Barranquero  <lekktu@gmail.com>
+
+	* help-fns.el (describe-variable): Complete all variables having
+	documentation, including keywords.
+	http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00112.html
+
 2011-04-04  Juanma Barranquero  <lekktu@gmail.com>
 
 	Convert to lexical-binding.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 71316c102fc..0876b34d3ed 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -635,8 +635,8 @@ it is displayed along with the global value."
 				  "Describe variable: ")
 				obarray
 				(lambda (vv)
-                                  (or (special-variable-p vv)
-                                      (get vv 'variable-documentation)))
+                                  (or (get vv 'variable-documentation)
+                                      (not (keywordp vv))))
 				t nil nil
 				(if (symbolp v) (symbol-name v))))
      (list (if (equal val "")