diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index b6082a61b304b07458c54f683b5fe4a4a258f7ca..3b731f9346cc5e7aaf23a2ad2c0ec7321d582daf 100644
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -117,7 +117,7 @@ main( int argc, char **argv )
 
 	authmethod = -1;
 
-	prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
+	prog = lutil_progname( "ldapcompare", argc, argv );
 
 	while (( i = getopt( argc, argv,
 		"Cd:D:h:H:IkKMnO:p:P:qQR:U:vw:WxX:Y:zZ")) != EOF )
diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 13230f5f78f57722686f4d206323d100a5a3337c..bc04de2b5b0462e3ff33f41b5a3647ee778c5e18 100644
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -17,6 +17,7 @@
 #include <ac/unistd.h>
 
 #include <ldap.h>
+#include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldap_defaults.h"
 
@@ -100,7 +101,7 @@ main( int argc, char **argv )
     authmethod = -1;
 	version = -1;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
+    prog = lutil_progname( "ldapdelete", argc, argv );
 
     while (( i = getopt( argc, argv, "cf:r"
 		"Cd:D:h:H:IkKMnO:p:P:QR:U:vw:WxX:Y:Z" )) != EOF )
diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index a72f6f0a9395cbf0117b72c1a314f0e9b5413131..ed73a57b29e645b8aac019cbde8509dbb3ce82f1 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -29,6 +29,7 @@
 
 #include <ldap.h>
 
+#include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldif.h"
 #include "ldap_defaults.h"
@@ -146,11 +147,7 @@ main( int argc, char **argv )
 	int		rc, i, authmethod, version, want_bindpw, debug, manageDSAit, referrals;
 	int count, len;
 
-    if (( prog = strrchr( argv[ 0 ], *LDAP_DIRSEP )) == NULL ) {
-	prog = argv[ 0 ];
-    } else {
-	++prog;
-    }
+    prog = lutil_progname( "ldapmodify", argc, argv );
 
     /* Print usage when no parameters */
     if( argc < 2 ) usage( prog );
diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 913481e1e3f85dd7234cf14e7b74be4b2a872aba..b5d2d5928388694bc56d83837f6c464dc4dc7cb1 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -29,6 +29,7 @@
 #include <ac/unistd.h>
 
 #include <ldap.h>
+#include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldap_defaults.h"
 
@@ -116,7 +117,7 @@ main(int argc, char **argv)
     authmethod = -1;
 	version = -1;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
+    prog = lutil_progname( "ldapmodrdn", argc, argv );
 
     while (( i = getopt( argc, argv, "cf:rs:"
 		"Cd:D:h:H:IkKMnO:p:P:QR:U:vw:WxX:Y:Z" )) != EOF )
diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 838eb0288e107756904a13be78a19003b170adfb..f78d5ce5c4c09be4809737f788a618c53ab806d3 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -18,7 +18,7 @@
 #include <ac/unistd.h>
 
 #include <ldap.h>
-
+#include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldap_defaults.h"
 
@@ -107,7 +107,7 @@ main( int argc, char *argv[] )
 	char	*retoid = NULL;
 	struct berval *retdata = NULL;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
+    prog = lutil_progname( "ldappasswd", argc, argv );
 
 	while( (i = getopt( argc, argv, "Aa:Ss:"
 		"Cd:D:h:H:InO:p:QR:U:vw:WxX:Y:Z" )) != EOF )
diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 471e20a07a8092a7d9c6425ce8f5ac964078eaee..0b3393e3c63a47c552c6a2c4beb08cfa8a481f3b 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -194,6 +194,8 @@ main( int argc, char **argv )
 	debug = verbose = not = vals2tmp = referrals = valuesReturnFilter =
 		attrsonly = manageDSAit = ldif = want_bindpw = 0;
 
+	prog = lutil_progname( "ldapsearch", argc, argv );
+
 	lutil_log_initialize(argc, argv);
 
 	deref = sizelimit = timelimit = version = -1;
@@ -223,8 +225,6 @@ main( int argc, char **argv )
 
 	urlize( def_urlpre );
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
-
 	while (( i = getopt( argc, argv, "Aa:b:E:F:f:Ll:S:s:T:tuz:"
 		"Cd:D:h:H:IkKMnO:p:P:QR:U:vw:WxX:Y:Z")) != EOF )
 	{
diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index d69e35faa4607c9f3347b8dc985d7f3aa7287264..58d926fb343083b7376fe1fca49b3f17b86064a8 100644
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -18,7 +18,7 @@
 #include <ac/unistd.h>
 
 #include <ldap.h>
-
+#include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldap_defaults.h"
 
@@ -100,7 +100,7 @@ main( int argc, char *argv[] )
 	char	*retoid = NULL;
 	struct berval *retdata = NULL;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
+	prog = lutil_progname( "ldapwhoami", argc, argv );
 
 	while( (i = getopt( argc, argv, "Aa:Ss:"
 		"Cd:D:h:H:InO:p:QR:U:vw:WxX:Y:Z" )) != EOF )