diff --git a/miscemu/main.c b/miscemu/main.c
index b77a34fdd1695814386b45061c710901588694a6..4ff9b2db2538e6be1a032d40df4c4a37e1e0aa74 100644
--- a/miscemu/main.c
+++ b/miscemu/main.c
@@ -47,7 +47,7 @@ BOOL32 MAIN_EmulatorInit(void)
 int main( int argc, char *argv[] )
 {
     extern char * DEBUG_argv0;
-    char startProg[256];
+    char startProg[256], defProg[256];
     int i,loaded;
     HINSTANCE32 handle;
 
@@ -87,6 +87,14 @@ int main( int argc, char *argv[] )
 
     loaded=0;
     
+    /* Add the Default Program if no program on the command line */
+    if (!argv[1])
+    {
+        PROFILE_GetWineIniString( "programs", "Default", "",
+                                  defProg, sizeof(defProg) );
+        if (defProg[0]) argv[argc++] = defProg;
+    }
+    
     /* Add the Startup Program to the run list */
     PROFILE_GetWineIniString( "programs", "Startup", "", 
 			       startProg, sizeof(startProg) );
diff --git a/wine.ini b/wine.ini
index 60beafbef497b1299c7ebf170fecf291b03393ea..9c7a69fda7db772823735646bc05f38f32705401 100644
--- a/wine.ini
+++ b/wine.ini
@@ -78,3 +78,7 @@ Exclude=WM_SIZE;WM_TIMER;
 [Tweak.Layout]
 ;; WineLook=xxx  (supported styles are 'Win31'(default), 'Win95', 'Win98')
 ;WineLook=Win95
+
+[programs]
+Default=
+Startup=
\ No newline at end of file