Index: /trunk/ccl/level-1/l1-clos-boot.lisp
===================================================================
--- /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 5939)
+++ /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 5940)
@@ -1535,10 +1535,13 @@
 
 
-(defglobal *funcallable-standard-object-class*
-  (make-standard-class 'funcallable-standard-object
-                       *standard-object-class* *function-class*))
+
 
 (defglobal *funcallable-standard-class-class*
   (make-standard-class 'funcallable-standard-class *std-class-class*))
+
+(defglobal *funcallable-standard-object-class*
+  (make-class 'funcallable-standard-object
+              (%class.own-wrapper *funcallable-standard-class-class*)
+              (list *standard-object-class* *function-class*)))
 
 (defglobal *generic-function-class*