diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c
index 1ab93c17437..77771001652 100644
--- a/programs/rundll32/rundll32.c
+++ b/programs/rundll32/rundll32.c
@@ -244,8 +244,10 @@ int main(int argc, char* argv[])
     if (!szDllName || *szDllName==0)
         goto CLEANUP;
     WINE_TRACE("DllName=%s\n",wine_dbgstr_w(szDllName));
-    if (!(szEntryPoint = strchrW( szDllName, ',' ))) goto CLEANUP;
-    *szEntryPoint++=0;
+    if ((szEntryPoint = strchrW(szDllName, ',' )))
+        *szEntryPoint++=0;
+    else
+        szEntryPoint = GetNextArg(&szCmdLine);
     WINE_TRACE("EntryPoint=%s\n",wine_dbgstr_w(szEntryPoint));
 
     /* Load the library */