diff --git a/ChangeLog b/ChangeLog
index f8f63cfef..8be0f49e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* Tools/sogo-tool.m (setupUserDefaults): new function that sets up
+	a few parameters on the user defaults. Notably, we override the
+	values for "SOGoLDAPQueryLimit" and "SOGoLDAPQueryTimeout" so that
+	they do not limit the amount of records that can be exported.
+
 	* Tools/SOGoToolBackup.m (-proceed): we empty the autorelease pool
 	every 10 iterations to avoid an excess of unreleased LDAP
 	connections.
diff --git a/Tools/sogo-tool.m b/Tools/sogo-tool.m
index f2173c326..ea36ecea4 100644
--- a/Tools/sogo-tool.m
+++ b/Tools/sogo-tool.m
@@ -28,6 +28,7 @@
 #import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
 
 #import "SOGoTool.h"
 
@@ -214,6 +215,21 @@
 
 @end
 
+static void
+setupUserDefaults (NSUserDefaults *ud)
+{
+  NSMutableDictionary *defaultsOverrides;
+
+  [ud registerDefaults: [ud persistentDomainForName: @"sogod"]];
+  defaultsOverrides = [NSMutableDictionary new];
+  [defaultsOverrides setObject: [NSNumber numberWithInt: 0]
+                        forKey: @"SOGoLDAPQueryLimit"];
+  [defaultsOverrides setObject: [NSNumber numberWithInt: 0]
+                        forKey: @"SOGoLDAPQueryTimeout"];
+  [ud registerDefaults: defaultsOverrides];
+  [defaultsOverrides release];
+}
+
 int
 main (int argc, char **argv, char **env)
 {
@@ -227,7 +243,7 @@ main (int argc, char **argv, char **env)
   pool = [NSAutoreleasePool new];
 
   ud = [NSUserDefaults standardUserDefaults];
-  [ud addSuiteNamed: @"sogod"];
+  setupUserDefaults (ud);
 
   if ([ud objectForKey: @"SOGoUserSources"])
     {