diff --git a/source/client/client.c b/source/client/client.c
index 1bd91d3d7ae..fde79c6e1bc 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4171,6 +4171,7 @@ static void usage(char *pname)
   pstring query_host;
   BOOL message = False;
   extern char tar_type;
+  static pstring servicesf = CONFIGFILE;
 
   *query_host = 0;
   *base_directory = 0;
@@ -4244,7 +4245,7 @@ static void usage(char *pname)
   setup_term_code (KANJI);
 #endif
   while ((opt = 
-	  getopt(argc, argv,"B:O:M:i:Nn:d:Pp:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF)
+	  getopt(argc, argv,"s:B:O:M:i:Nn:d:Pp:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF)
     switch (opt)
       {
       case 'm':
@@ -4334,6 +4335,9 @@ static void usage(char *pname)
 	usage(pname);
 	exit(0);
 	break;
+      case 's':
+	strcpy(servicesf, optarg);
+	break;
       case 't':
 #ifdef KANJI
 	if (!setup_term_code (optarg)) {
@@ -4357,6 +4361,11 @@ static void usage(char *pname)
 
   DEBUG(3,("%s client started (version %s)\n",timestring(),VERSION));
 
+  if (!lp_load(servicesf,True)) {
+    fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
+    return (-1);
+  }
+
   load_interfaces();
   get_myname(*myname?NULL:myname,NULL);  
   strupper(myname);