--- a/smalltalk.rc	Fri Dec 03 12:05:26 1999 +0100
+++ b/smalltalk.rc	Fri Dec 03 15:39:19 1999 +0100
@@ -56,6 +56,9 @@
 	Smalltalk systemPath:(Smalltalk systemPath remove:path; yourself).
     ]
 ].
+(path := OperatingSystem getEnvironment:'STX_PACKAGEPATH') notNil ifTrue:[
+    Smalltalk packagePath:(path asCollectionOfSubstringsSeparatedBy:$:)
+].
 !
 
 |args|
@@ -103,7 +106,8 @@
 "/ (and if display connection can be established)
 "/ if not, enter a simple read-eval-print loop
 "/
-Display isNil ifTrue:[
+Smalltalk isHeadless ifFalse:[
+  Display isNil ifTrue:[
     (args includes:'--noDisplay') ifFalse:[
 	DeviceWorkstation notNil ifTrue:[
 	    'smalltalk.rc [warning]: No Display connection.' errorPrintCR.
@@ -128,6 +132,7 @@
 	    ]
 	].
     ].
+  ].
 ].
 
 "/
@@ -287,6 +292,7 @@
 "/
 
 Smalltalk isStandAloneApp ifFalse:[
+  Smalltalk isHeadless ifFalse:[
     Display notNil ifTrue:[
 	(Smalltalk commandLineArguments includes:'--noLicenceBox') ifFalse:[
 	    Smalltalk addStartBlock:[
@@ -303,6 +309,7 @@
 	    ]
 	]
     ]
+  ]
 ].
 !
 
@@ -325,9 +332,19 @@
 "/
 '../../doc' asFilename exists ifTrue:[
     Smalltalk systemPath addFirst:'../..'.
+    '../../../stx' asFilename exists ifTrue:[
+	Smalltalk packagePath addFirst:'../../..'.    
+    ]
 ].
 '../doc' asFilename exists ifTrue:[
     Smalltalk systemPath addFirst:'..'.
+    '../../stx' asFilename exists ifTrue:[
+	Smalltalk packagePath addFirst:'../..'.    
+    ]
+].
+
+'packages' asFilename exists ifTrue:[
+ Smalltalk packagePath addFirst:'./packages'.    
 ].
 
 "/ but, the current directory should always be first ...
@@ -379,6 +396,11 @@
     Smalltalk at:#Window put:(Display class).
     Smalltalk at:#Screen put:(Display class).
     Smalltalk at:#Sensor put:Display.
+] ifFalse:[
+    DeviceWorkstation notNil ifTrue:[
+	Smalltalk at:#Window put:DeviceWorkstation.
+	Smalltalk at:#Screen put:DeviceWorkstation.
+    ]
 ].
 
 "/