diff --git a/build/win32/set_df_path.vbs b/build/win32/set_df_path.vbs
index 219d150da..0da7203b5 100644
--- a/build/win32/set_df_path.vbs
+++ b/build/win32/set_df_path.vbs
@@ -2,11 +2,18 @@ Option Explicit
 
 Const BIF_returnonlyfsdirs   = &H0001
 
-Dim wsh, objDlg, objF, fso, spoFile
-Set objDlg = WScript.CreateObject("Shell.Application")
-Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs)
+Dim wsh, objDlg, objF, fso, spoFile, args
 
 Set fso = CreateObject("Scripting.FileSystemObject")
+
+set args = Wscript.Arguments
+if args.count > 0 Then
+    Set ObjF = fso.GetFolder(args.Item(0))
+else
+    Set objDlg = WScript.CreateObject("Shell.Application")
+    Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs).Self
+end if
+
 If fso.FileExists("DF_PATH.txt") Then
     fso.DeleteFile "DF_PATH.txt", True
 End If
@@ -14,7 +21,7 @@ End If
 If IsValue(objF) Then
     If InStr(1, TypeName(objF), "Folder") > 0 Then
         Set spoFile = fso.CreateTextFile("DF_PATH.txt", True)
-        spoFile.WriteLine(objF.Self.Path)
+        spoFile.WriteLine(objF.Path)
     End If
 End If
 
diff --git a/build/win64/set_df_path.vbs b/build/win64/set_df_path.vbs
index 219d150da..0da7203b5 100644
--- a/build/win64/set_df_path.vbs
+++ b/build/win64/set_df_path.vbs
@@ -2,11 +2,18 @@ Option Explicit
 
 Const BIF_returnonlyfsdirs   = &H0001
 
-Dim wsh, objDlg, objF, fso, spoFile
-Set objDlg = WScript.CreateObject("Shell.Application")
-Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs)
+Dim wsh, objDlg, objF, fso, spoFile, args
 
 Set fso = CreateObject("Scripting.FileSystemObject")
+
+set args = Wscript.Arguments
+if args.count > 0 Then
+    Set ObjF = fso.GetFolder(args.Item(0))
+else
+    Set objDlg = WScript.CreateObject("Shell.Application")
+    Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs).Self
+end if
+
 If fso.FileExists("DF_PATH.txt") Then
     fso.DeleteFile "DF_PATH.txt", True
 End If
@@ -14,7 +21,7 @@ End If
 If IsValue(objF) Then
     If InStr(1, TypeName(objF), "Folder") > 0 Then
         Set spoFile = fso.CreateTextFile("DF_PATH.txt", True)
-        spoFile.WriteLine(objF.Self.Path)
+        spoFile.WriteLine(objF.Path)
     End If
 End If