diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index fdb4404..15d320c 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1134,12 +1134,12 @@
   else {
     for (i=0; i<=WCMD_EXIT; i++) {
       if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT,
-	  param1, -1, inbuilt[i], -1) == 2) {
+	  command, -1, inbuilt[i], -1) == 2) {
 	WCMD_output_asis (WCMD_LoadMessage(i));
 	return;
       }
     }
-    WCMD_output (WCMD_LoadMessage(WCMD_NOCMDHELP), param1);
+    WCMD_output (WCMD_LoadMessage(WCMD_NOCMDHELP), command);
   }
   return;
 }
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index f97a1fd..b2243e3 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1411,6 +1411,15 @@
     WCMD_parse (p, quals, param1, param2);
     WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2));
 
+    if((p[0] == '/') && (p[1] == '?')) {
+
+      /*this is a help request for a program*/
+      i = WCMD_HELP;
+      memcpy(p, whichcmd, count * sizeof(WCHAR));
+      p[count] = '\0';
+
+    }
+
     switch (i) {
 
       case WCMD_ATTRIB: