diff --git a/ChangeLog b/ChangeLog
index 63e24fd61..7e018a302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Feb 17   8:52:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSProcessInfo.m: Include process name in arguments list as
+	in the OPENSTEP implementation - suggested by dirk@object-factory.com
+	* Source/Tools/defaults.m: Adjust for change to NSProcessInfo
+	* Source/Tools/dread.m: ditto.
+	* Source/Tools/dwrite.m: ditto.
+	* Source/Tools/dremove.m: ditto.
+	* Source/Tools/plparse.m: ditto.
+	* Source/Tools/sfparse.m: ditto.
+
 Tue Feb 16  15:35:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSArray.m: ([-removeObjectsFromIndices:]) rewrite to
diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m
index a4f01d8bb..c3f541bcb 100644
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@@ -151,7 +151,7 @@ _gnu_process_args(int argc, char *argv[], char *env[])
     int added = 0;
 
     _debug_array = [[NSMutableArray alloc] init];
-    for (i = 1; i < argc; i++) 
+    for (i = 0; i < argc; i++) 
       {
 	NSString	*str = [NSString stringWithCString:argv[i]];
 	if ([str hasPrefix: @"--GNU-Debug="])
diff --git a/Tools/defaults.m b/Tools/defaults.m
index df47d6170..80dcc687a 100644
--- a/Tools/defaults.m
+++ b/Tools/defaults.m
@@ -52,7 +52,7 @@ main(int argc, char** argv)
 
     args = [proc arguments];
 
-    for (i = 0; i < [args count]; i++) {
+    for (i = 1; i < [args count]; i++) {
 	if ([[args objectAtIndex: i] isEqual: @"--help"] ||
 	    [[args objectAtIndex: i] isEqual: @"help"]) {
 	    printf(
@@ -160,7 +160,7 @@ property list which is set as the value of a default.\n\n");
 	}
     }
 
-    i = 0;
+    i = 1;
     if ([args count] <= i) {
 	NSLog(@"defaults: too few arguments supplied!\n");
 	[pool release];
diff --git a/Tools/dread.m b/Tools/dread.m
index 82ad3dc39..251e7b8fe 100644
--- a/Tools/dread.m
+++ b/Tools/dread.m
@@ -49,7 +49,7 @@ main(int argc, char** argv)
 
     args = [proc arguments];
 
-    for (i = 0; i < [args count]; i++) {
+    for (i = 1; i < [args count]; i++) {
 	if ([[args objectAtIndex: i] isEqual: @"--help"]) {
 	    printf(
 "\nThe 'dread' command lets you to read a user's defaults database.\n"
@@ -83,7 +83,7 @@ main(int argc, char** argv)
 	}
     }
 
-    i = 0;
+    i = 1;
     if ([args count] <= i) {
 	NSLog(@"too few arguments supplied!\n");
 	[pool release];
diff --git a/Tools/dremove.m b/Tools/dremove.m
index a7884a94b..6a5c896c9 100644
--- a/Tools/dremove.m
+++ b/Tools/dremove.m
@@ -49,7 +49,7 @@ main(int argc, char** argv)
 
     args = [proc arguments];
 
-    for (i = 0; i < [args count]; i++) {
+    for (i = 1; i < [args count]; i++) {
         if ([[args objectAtIndex: i] isEqual: @"--help"]) {
 	    printf(
 "The 'dremove' command lets you delete entries in a user's defaults database.\n"
@@ -76,7 +76,7 @@ main(int argc, char** argv)
 	}
     }
 
-    i = 0;
+    i = 1;
     if ([args count] > i && [[args objectAtIndex: i] isEqual: @"-u"]) {
 	if ([args count] > ++i) {
 	    user = [args objectAtIndex: i++];
diff --git a/Tools/dwrite.m b/Tools/dwrite.m
index 4372add60..81b8e9ee6 100644
--- a/Tools/dwrite.m
+++ b/Tools/dwrite.m
@@ -52,7 +52,7 @@ main(int argc, char** argv)
 
     args = [proc arguments];
 
-    for (i = 0; i < [args count]; i++) {
+    for (i = 1; i < [args count]; i++) {
         if ([[args objectAtIndex: i] isEqual: @"--help"]) {
 	    printf(
 "The 'dwrite' command lets you modify a user's defaults database.\n"
@@ -80,7 +80,7 @@ main(int argc, char** argv)
 	}
     }
 
-    i = 0;
+    i = 1;
     if ([args count] > i && [[args objectAtIndex: i] isEqual: @"-u"]) {
 	if ([args count] > ++i) {
 	    user = [args objectAtIndex: i++];
diff --git a/Tools/plparse.m b/Tools/plparse.m
index 6f8d03773..8fdd05c55 100644
--- a/Tools/plparse.m
+++ b/Tools/plparse.m
@@ -46,13 +46,13 @@ main(int argc, char** argv)
 
   args = [proc arguments];
 
-  if ([args count] == 0)
+  if ([args count] <= 1)
     {
       NSLog(@"No file names given to parse.");
     }
   else
     {
-      for (i = 0; i < [args count]; i++)
+      for (i = 1; i < [args count]; i++)
 	{
 	  NSString	*file = [args objectAtIndex: i];
 
diff --git a/Tools/sfparse.m b/Tools/sfparse.m
index f28fc351b..33156b728 100644
--- a/Tools/sfparse.m
+++ b/Tools/sfparse.m
@@ -46,13 +46,13 @@ main(int argc, char** argv)
 
   args = [proc arguments];
 
-  if ([args count] == 0)
+  if ([args count] <= 1)
     {
       NSLog(@"No file names given to parse.");
     }
   else
     {
-      for (i = 0; i < [args count]; i++)
+      for (i = 1; i < [args count]; i++)
 	{
 	  NSString	*file = [args objectAtIndex: i];