diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 7c4d0c5a4..9fec60c3d 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -3320,6 +3320,12 @@ int glestMain(int argc, char** argv) {
 	    	}
 	    }
 
+	    if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_DISABLE_OPENGL_CAPS_CHECK]) == true ||
+	    		config.getBool("CheckGlCaps") == false) {
+	    	printf("**WARNING** disabling opengl capability checking...\n");
+	    	config.setBool("CheckGlCaps",false,true);
+	    }
+
 	    bool enableATIHacks = config.getBool("EnableATIHacks","false");
 	    if(enableATIHacks == true) {
 	    	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("**WARNING** Enabling ATI video card hacks\n");
diff --git a/source/shared_lib/include/platform/sdl/platform_main.h b/source/shared_lib/include/platform/sdl/platform_main.h
index 98b710cb8..74621830b 100644
--- a/source/shared_lib/include/platform/sdl/platform_main.h
+++ b/source/shared_lib/include/platform/sdl/platform_main.h
@@ -84,6 +84,8 @@ const char  *GAME_ARGS[] = {
 
 	"--disable-videos",
 
+	"--disable-opengl-checks",
+
 	"--verbose"
 
 };
@@ -152,6 +154,8 @@ enum GAME_ARG_TYPE {
 
 	GAME_ARG_DISABLE_VIDEOS,
 
+	GAME_ARG_DISABLE_OPENGL_CAPS_CHECK,
+
 	GAME_ARG_VERBOSE_MODE,
 
 	GAME_ARG_END
@@ -436,6 +440,9 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) {
 
 	printf("\n%s\t\tdisables video playback.",GAME_ARGS[GAME_ARG_DISABLE_VIDEOS]);
 
+	printf("\n%s\t\tdisables opengl capability checks (for corrupt or flaky video drivers).",GAME_ARGS[GAME_ARG_DISABLE_OPENGL_CAPS_CHECK]);
+
+
 	printf("\n%s\t\t\tdisplays verbose information in the console.",GAME_ARGS[GAME_ARG_VERBOSE_MODE]);
 
 	printf("\n\n");