diff --git a/pcl/cmucl-documentation.lisp b/pcl/cmucl-documentation.lisp
index 76aba150b2de6cca1e7a92997c3d70392c012183..5df3acbe36dda775834e8bec64de5a98388dfb3c 100644
--- a/pcl/cmucl-documentation.lisp
+++ b/pcl/cmucl-documentation.lisp
@@ -4,7 +4,7 @@
 ;;; the public domain, and is provided 'as is'.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.5 1997/09/16 17:12:13 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.6 1998/05/04 00:08:32 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -59,12 +59,22 @@
 (defmethod documentation ((x structure-class) (doc-type (eql 't)))
   (values (ext:info type documentation (class-name x))))
 
+(defmethod documentation ((x lisp:standard-class) (doc-type (eql 't)))
+  (or (values (ext:info type documentation (lisp:class-name x)))
+      (let ((pcl-class (kernel:class-pcl-class x)))
+	(and pcl-class (plist-value pcl-class 'documentation)))))
+
 (defmethod documentation ((x lisp:structure-class) (doc-type (eql 'type)))
   (values (ext:info type documentation (lisp:class-name x))))
 
 (defmethod documentation ((x structure-class) (doc-type (eql 'type)))
   (values (ext:info type documentation (class-name x))))
 
+(defmethod documentation ((x lisp:standard-class) (doc-type (eql 'type)))
+  (or (values (ext:info type documentation (lisp:class-name x)))
+      (let ((pcl-class (kernel:class-pcl-class x)))
+	(and pcl-class (plist-value pcl-class 'documentation)))))
+
 (defmethod documentation ((x symbol) (doc-type (eql 'type)))
   (or (values (ext:info type documentation x))
       (let ((class (find-class x nil)))