diff --git a/ChangeLog b/ChangeLog
index d0c67668d..fa939956e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
 
 2011-07-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* Tools/sogo-tool.m (main): instantiate SOGoSystemDefaults in
+	order to properly inject the entries from SOGoDefaults.plist.
+
 	* OpenChange/MAPIStoreSOGo.m (sogo_op_get_fid_by_name): removed
 	obsolete method.
 
diff --git a/Tools/sogo-tool.m b/Tools/sogo-tool.m
index 1d26bbc54..fc93456e9 100644
--- a/Tools/sogo-tool.m
+++ b/Tools/sogo-tool.m
@@ -30,6 +30,8 @@
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 
+#import <SOGo/SOGoSystemDefaults.h>
+
 #import "SOGoTool.h"
 
 /* TODO:
@@ -242,6 +244,8 @@ main (int argc, char **argv, char **env)
 
   pool = [NSAutoreleasePool new];
 
+  [SOGoSystemDefaults sharedSystemDefaults];
+
   ud = [NSUserDefaults standardUserDefaults];
   setupUserDefaults (ud);