diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 68e2217fb56..250f02efec4 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -18,7 +18,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "popt_common_cmdline.h"
+#include "lib/cmdline/cmdline.h"
 #include "libsmbclient.h"
 #include "cmdline_contexts.h"
 
@@ -1005,7 +1005,7 @@ int main(int argc, char **argv)
 		goto done;
 	}
 
-	popt_burn_cmdline_password(argc, argv);
+	samba_cmdline_burn(argc, argv);
 
 	if (smbc_init(get_auth_data, opt.debuglevel) < 0) {
 		fprintf(stderr, "Unable to initialize libsmbclient\n");
diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index ca90df3e88e..29ec7adc856 100644
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -59,7 +59,7 @@ bld.SAMBA3_BINARY('smbget',
                  source='smbget.c',
                  deps='''
                  talloc
-                 popt_samba3_cmdline
+                 cmdline
                  smbclient''')
 
 bld.SAMBA3_BINARY('nmblookup',