--- a/Autoload.st	Tue Oct 13 18:24:33 2009 +0200
+++ b/Autoload.st	Tue Oct 13 18:43:33 2009 +0200
@@ -103,7 +103,6 @@
                                     notifierString:'autoload failed'.
 
         self class changeClassTo:AutoloadMetaclass.
-        self setSuperclass:nil.
         ObjectMemory flushCaches.
     ].
     LoadedClasses isNil ifTrue:[
@@ -387,7 +386,7 @@
                             "/ this will vanish as soon as source-directory
                             "/ is always guaranteed to contain an stx-subtree
                             ((packageID startsWith:'stx/') 
-                            or:[packageID startsWith:'stx:']) ifTrue:[
+                             or:[packageID startsWith:'stx:']) ifTrue:[
                                 Smalltalk 
                                     fileInClass:myName
                                     package:(packageID copyFrom:5)
@@ -842,7 +841,7 @@
 
     "take care: subclassing Autoload must still be possible"
     (self == Autoload) ifTrue:[
-        ^ self perform:sel inClass:Autoload class superclass withArguments:args
+        ^ self perform:sel inClass:self class superclass withArguments:args
     ].
 
     newClass := self autoload.
@@ -937,11 +936,11 @@
 !Autoload class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.153 2009-10-13 09:55:18 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.154 2009-10-13 16:43:33 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.153 2009-10-13 09:55:18 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.154 2009-10-13 16:43:33 stefan Exp $'
 ! !
 
 Autoload initialize!