diff --git a/code/macros.lisp b/code/macros.lisp
index cb87a18e8e6858462cb8e56380d599e0e5d6a645..a5f58110d052bdc0f985a7eed70c8128be1dbcea 100644
--- a/code/macros.lisp
+++ b/code/macros.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.50 1997/06/05 13:02:45 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.51 1997/09/03 20:27:08 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -982,7 +982,6 @@
 (defsetf symbol-value set)
 (defsetf symbol-function fset)
 (defsetf symbol-plist %set-symbol-plist)
-(defsetf documentation %set-documentation)
 (defsetf nth %setnth)
 (defsetf fill-pointer %set-fill-pointer)
 (defsetf search-list %set-search-list)
diff --git a/code/misc.lisp b/code/misc.lisp
index f8efa29753362f797a807066089d3781ff7d5666..c1b49c8e8b617126e30d1dfcb29024927a23b73d 100644
--- a/code/misc.lisp
+++ b/code/misc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/misc.lisp,v 1.25 1997/09/03 19:36:26 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/misc.lisp,v 1.26 1997/09/03 20:27:07 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -95,7 +95,7 @@
        (typecase x
 	 (symbol (try-cmucl-random-doc x doc-type)))))))
 
-(defun %set-documentation (name doc-type string)
+(defun (setf documentation) (string name doc-type)
   (case doc-type
     (variable (setf (info variable documentation name) string))
     (function (setf (info function documentation name) string))
diff --git a/compiler/fndb.lisp b/compiler/fndb.lisp
index 6ed5c0414cb6a4b79ddd0cc6a259a54b2b4d79a4..0642d6e6876fc3f814899007fe70e3a0d9ebc37a 100644
--- a/compiler/fndb.lisp
+++ b/compiler/fndb.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/fndb.lisp,v 1.72 1997/09/01 16:15:27 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/fndb.lisp,v 1.73 1997/09/03 20:27:11 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -29,7 +29,6 @@
 	  %rplacd
 	  %sbitset
 	  %scharset
-	  %set-documentation
 	  %set-fdefinition
 	  %set-fill-pointer
 	  %set-row-major-aref
@@ -1165,7 +1164,7 @@
 (defknown %set-symbol-value (symbol t) t (unsafe))
 (defknown fset (symbol function) function (unsafe))
 (defknown %set-symbol-plist (symbol t) t (unsafe))
-(defknown %set-documentation ((or symbol cons) symbol (or string null))
+(defknown (setf documentation) ((or string null) t symbol)
   (or string null)
   ())
 (defknown %setnth (index list t) t (unsafe))