diff --git a/ChangeLog b/ChangeLog
index b4994af30..f532ca937 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
 	* OpenChange/MAPIStoreSOGo.m (sogo_backend_init): invoke
 	-[NSProcessInfo initializeWithArguments:count:environment:] in
 	order to avoid an infinite loop with GNUstep occurring under
-	strange circumstances.
+	strange circumstances. Make use of "samba" as process name.
 
 	* OpenChange/MAPIStoreMapping.m (-initForUsername:withIndexing:):
 	attach the struct tdb_wrap *indexing to a new memCtx ivar, in
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 0d7ba1ade..6f1ca6a06 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -70,6 +70,7 @@ sogo_backend_init (void)
   Class MAPIApplicationK;
   NSUserDefaults *ud;
   SoProductRegistry *registry;
+  char *argv0 = "openchange";
 
   pool = [NSAutoreleasePool new];
 
@@ -78,8 +79,8 @@ sogo_backend_init (void)
      the encoding specified in the file. */
   putenv ("GNUSTEP_STRING_ENCODING=NSUTF8StringEncoding");
 
-  [NSProcessInfo initializeWithArguments: NULL
-                                   count: 0
+  [NSProcessInfo initializeWithArguments: &argv0
+                                   count: 1
                              environment: environ];
 
   [SOGoSystemDefaults sharedSystemDefaults];