diff -Nuar a/doc/docstrings.lisp b/doc/docstrings.lisp
--- a/doc/docstrings.lisp	2016-12-11 00:04:21.272877121 +0100
+++ b/doc/docstrings.lisp	2016-12-11 00:05:03.752876882 +0100
@@ -718,7 +718,7 @@
             ;; sbcl.texinfo defines macros that expand @&key and friends to &key.
             (mapcar (lambda (name)
                       (if (member name lambda-list-keywords)
-                          (format nil "@~A" name)
+                          (format nil "~A" name)
                           name))
                     (lambda-list doc)))))
 
@@ -833,11 +833,11 @@
   (flet ((macro (name)
                  (let ((string (string-downcase name)))
                    (format *texinfo-output* "@macro ~A~%~A~%@end macro~%" string string))))
-    (macro '&allow-other-keys)
-    (macro '&optional)
-    (macro '&rest)
-    (macro '&key)
-    (macro '&body)))
+    (macro 'allow-other-keys)
+    (macro 'optional)
+    (macro 'rest)
+    (macro 'key)
+    (macro 'body)))
 
 (defun generate-includes (directory packages &key (base-package :cl-user))
   "Create files in `directory' containing Texinfo markup of all