diff --git a/ChangeLog b/ChangeLog
index 2164cd480..2f091236a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 2010-03-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
-	* Tools/SOGoSockDOperation.m, Tools/SOGoSockDScanner.m,
-	Tools/SOGoSockD.m: new modules implementing the sockd backend
-	tool for slapd.
+	* Tools/sogo-slapd-sockd.m, Tools/SOGoSockDOperation.m,
+	Tools/SOGoSockDScanner.m, Tools/SOGoSockD.m: new modules
+	implementing the sockd backend tool for slapd.
 
 	* Tools/sogo-tool.m (-run): return a proper return code rather
 	than "NO".
diff --git a/Tools/sogo-slapd-sockd.m b/Tools/sogo-slapd-sockd.m
new file mode 100644
index 000000000..a12b32384
--- /dev/null
+++ b/Tools/sogo-slapd-sockd.m
@@ -0,0 +1,63 @@
+/* sogo-slapd-sockd.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import "SOGoSockD.h"
+
+int
+main (int argc, char **argv, char **env)
+{
+  NSAutoreleasePool *pool;
+  NSUserDefaults *ud;
+  SOGoSockD *sockd;
+  int rc;
+
+  rc = 0;
+
+  pool = [NSAutoreleasePool new];
+
+  ud = [NSUserDefaults standardUserDefaults];
+  [ud addSuiteNamed: @"sogod"];
+
+  if ([ud objectForKey: @"SOGoUserSources"])
+    {
+      sockd = [SOGoSockD new];
+      if ([sockd run])
+        rc = 0;
+      else
+        rc = -1;
+      [sockd release];
+    }
+  else
+    {
+      NSLog (@"No LDAP source is configured in the SOGo configuration of this"
+             @" account. Please make sure to use this tool under the same"
+             @" username as SOGo.");
+      rc = -1;
+    }
+
+  [pool release];
+
+  return rc;
+}