--- a/Smalltalk.st	Fri Nov 17 14:37:11 2000 +0100
+++ b/Smalltalk.st	Fri Nov 17 15:38:29 2000 +0100
@@ -2947,24 +2947,32 @@
     clsSym := clsName asSymbol.
 
     "/ install if not already compiled-in
-    (self at:clsSym) isNil ifTrue:[
-	Autoload subclass:clsSym
-	    instanceVariableNames:''
-	    classVariableNames:''
-	    poolDictionaries:''
-	    category:cat
-	    inEnvironment:Smalltalk.
-
-	cls := self at:clsSym.
-	cls isNil ifTrue:[
-	    ('Smalltalk [warning]: failed to install ' , clsName , ' as autoloaded.') infoPrintCR.
-	] ifFalse:[
-	    cls package:package asSymbol.
-	    revisionOrNil notNil ifTrue:[
-		cls setBinaryRevision:revisionOrNil
-	    ]
-	]    
-    ]
+    (cls := self at:clsSym) isNil ifTrue:[
+        Autoload subclass:clsSym
+            instanceVariableNames:''
+            classVariableNames:''
+            poolDictionaries:''
+            category:cat
+            inEnvironment:Smalltalk.
+
+        cls := self at:clsSym.
+        cls isNil ifTrue:[
+            ('Smalltalk [warning]: failed to install ' , clsName , ' as autoloaded.') infoPrintCR.
+        ] ifFalse:[
+            cls package:package asSymbol.
+            revisionOrNil notNil ifTrue:[
+                cls setBinaryRevision:revisionOrNil
+            ]
+        ]    
+    ] ifFalse:[
+        "/ class already present - however, check for same category/package
+        package ~= cls package ifTrue:[
+            cls package:package asSymbol.
+        ].
+        cat ~= cls category ifTrue:[
+            cls category:cat.
+        ].
+    ].
 
     "Created: / 5.11.1998 / 15:10:25 / cg"
 !
@@ -5801,5 +5809,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.474 2000-10-27 09:38:14 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.475 2000-11-17 14:38:29 cg Exp $'
 ! !