diff --git a/ChangeLog b/ChangeLog
index fa22fe6b2..e0ca3c944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 24 08:30:00 2000  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSUser.m: NSOpenStepRootDirectory() use GNUSTEP_ROOT
+
 Tue Feb 22 15:03:46 2000  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* Headers/Foundation/NSPort.h: Fixed typo: changed `@class
diff --git a/Source/NSUser.m b/Source/NSUser.m
index 9e4674341..34d27d12d 100644
--- a/Source/NSUser.m
+++ b/Source/NSUser.m
@@ -265,8 +265,9 @@ NSTemporaryDirectory(void)
   if ([manager fileExistsAtPath: tempDirName] == NO)
     {
       NSDictionary *attr;
+
       attr = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt: 0700]
-			   forKey: NSFilePosixPermissions];
+					 forKey: NSFilePosixPermissions];
       if ([manager createDirectoryAtPath: tempDirName attributes: attr] == NO)
 	tempDirName = baseTempDirName;
     }
@@ -277,10 +278,10 @@ NSTemporaryDirectory(void)
 NSString *
 NSOpenStepRootDirectory(void)
 {
-  NSString* root = [[[NSProcessInfo processInfo] environment]
-		     objectForKey:@"GNUSTEP_SYSTEM_ROOT"];
+  NSString	*root = [[[NSProcessInfo processInfo] environment]
+		     objectForKey: @"GNUSTEP_ROOT"];
 
-  if (!root)
+  if (root == nil)
 #if	defined(__WIN32__)
     root = @"C:\\";
 #else