diff --git a/setup/devcon/devcon.cpp b/setup/devcon/devcon.cpp
index b1bdbf2ab..7e7e88a7d 100644
--- a/setup/devcon/devcon.cpp
+++ b/setup/devcon/devcon.cpp
@@ -1149,7 +1149,12 @@ Return Value:
     for(dispIndex = 0;DispatchTable[dispIndex].cmd;dispIndex++) {
         if ((_tcsicmp(cmd,DispatchTable[dispIndex].cmd) == 0) &&
             (argc >= firstArg)) {
-            retval = DispatchTable[dispIndex].func(baseName,machine,flags,argc-firstArg,argv+firstArg);
+            if (argc == firstArg) {
+                retval = DispatchTable[dispIndex].func(baseName,machine,flags,0,NULL);
+            } else {
+                retval = DispatchTable[dispIndex].func(baseName,machine,flags,argc-firstArg,argv+firstArg);
+            }            
+            
             switch(retval) {
                 case EXIT_USAGE:
                     CommandUsage(baseName,DispatchTable[dispIndex].cmd);
diff --git a/setup/devcon/devcon.rc b/setup/devcon/devcon.rc
index ead46f856..c9cccb55f 100644
--- a/setup/devcon/devcon.rc
+++ b/setup/devcon/devcon.rc
@@ -27,11 +27,11 @@ STRINGTABLE DISCARDABLE
 // Version resources
 //
 #include <ntverp.h>
-#define VER_FILETYPE                VFT_DLL
+#define VER_FILETYPE                VFT_APP
 #define VER_FILESUBTYPE             VFT2_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "Windows Setup API"
-#define VER_INTERNALNAME_STR        "SETUPAPI.DLL"
-#define VER_ORIGINALFILENAME_STR    "SETUPAPI.DLL"
+#define VER_FILEDESCRIPTION_STR     "Device Console"
+#define VER_INTERNALNAME_STR        "DevCon.exe"
+#define VER_ORIGINALFILENAME_STR    "DevCon.exe"
 #include <common.ver>
 
 #include "msg.rc"