diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 21472fe83..b75701366 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -212,8 +212,10 @@ ifeq ($(PLATFORM),DARWIN)
                 -Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \
                 -Wl,-framework,QuickTime -lm
     endif
-    EDITOROBJS+=$(OBJ)/GrpFile.game.$o $(OBJ)/GameListSource.game.$o $(OBJ)/StartupWinController.game.$o
-    GAMEOBJS+=$(OBJ)/GrpFile.game.$o $(OBJ)/GameListSource.game.$o $(OBJ)/StartupWinController.game.$o
+    ifneq (0,$(OSX_STARTUPWINDOW))
+        EDITOROBJS+=$(OBJ)/GrpFile.game.$o $(OBJ)/GameListSource.game.$o $(OBJ)/StartupWinController.game.$o
+        GAMEOBJS+=$(OBJ)/GrpFile.game.$o $(OBJ)/GameListSource.game.$o $(OBJ)/StartupWinController.game.$o
+    endif
     NASMFLAGS += -f macho
 endif
 
diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index 93dddf3b5..2017a6d5d 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -13,6 +13,8 @@ DXROOT_OVERRIDE:=
 # Mac OS X Frameworks location
 # Like above, use absolute paths.
 APPLE_FRAMEWORKS ?=/Library/Frameworks
+# Since the OS X startup window is generating errors, disable it by default.
+OSX_STARTUPWINDOW ?= 0
 
 # Engine options
 #  USE_OPENGL     - enables basic OpenGL Polymost renderer
@@ -163,6 +165,9 @@ endif
 ifneq (0,$(USE_LIBVPX))
     BASECFLAGS+= -DUSE_LIBVPX
 endif
+ifneq (0,$(OSX_STARTUPWINDOW))
+    BASECFLAGS+= -DOSX_STARTUPWINDOW
+endif
 
 ifneq (0,$(EFENCE))
     LIBS+= -lefence
diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile
index d89173ab0..00fb18f03 100644
--- a/polymer/eduke32/build/Makefile
+++ b/polymer/eduke32/build/Makefile
@@ -121,7 +121,10 @@ ifeq ($(PLATFORM),LINUX)
     ASFLAGS+= -f elf
 endif
 ifeq ($(PLATFORM),DARWIN)
-    ENGINEOBJS += $(OBJ)/osxbits.$o $(OBJ)/StartupWinController.editor.$o
+    ENGINEOBJS += $(OBJ)/osxbits.$o
+    ifneq (0,$(OSX_STARTUPWINDOW))
+        ENGINEOBJS += $(OBJ)/StartupWinController.editor.$o
+    endif
     ASFLAGS     += -f macho -DUNDERSCORES
     OURCFLAGS   += -fno-pic -DUNDERSCORES
 endif
diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index d71766ca5..ccc86ade4 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -479,7 +479,7 @@ void M32_DrawRoomsAndMasks(void)
 }
 
 #undef STARTUP_SETUP_WINDOW
-#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2))
+#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
 # define STARTUP_SETUP_WINDOW
 #endif
 
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 3c097076f..23584669a 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -8409,7 +8409,7 @@ static void G_ShowParameterHelp(void)
               "-check\t\tEnables map pointer checking when saving\n"
               "-namesfile FILE\tUses FILE instead of NAMES.H for tile names\n"
               "-nocheck\t\tDisables map pointer checking when saving (default)\n"  // kept for script compat
-#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2))
+#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
               "-setup\t\tDisplays the configuration dialog\n"
 #endif
 #if !defined(_WIN32)
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index f489de6cc..a4d7fe8b2 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -7975,7 +7975,7 @@ static void G_ShowParameterHelp(void)
               "-r\t\tRecord demo\n"
               "-s#\t\tSet skill level (1-4)\n"
               "-server\t\tStart a multiplayer game for other players to join\n"
-#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2))
+#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
               "-setup/nosetup\tEnables/disables startup window\n"
 #endif
               "-t#\t\tSet respawn mode: 1 = Monsters, 2 = Items, 3 = Inventory, x = All\n"
@@ -10001,7 +10001,7 @@ int32_t app_main(int32_t argc,const char **argv)
         else if (!fg) g_gameNamePtr = "Unknown GRP";
     }
 
-#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2)))
+#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)))
     if (i < 0 || (!g_noSetup && (ud.configversion != BYTEVERSION_JF || ud.config.ForceSetup)) || g_commandSetup)
     {
         if (quitevent || !startwin_run())
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 31ec36130..2155e917a 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -5869,7 +5869,7 @@ void C_Compile(const char *filenam)
                 }
                 else
                 {
-#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2)))
+#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)))
                     while (!quitevent) // keep the window open so people can copy CON errors out of it
                         handleevents();
 #endif