diff --git a/main.C b/main.C
index 0e9e7c1a83e81f66c4726162b278397ac2620c87..6663da87bff9f428b86334380afa08976a9373d0 100644
--- a/main.C
+++ b/main.C
@@ -80,10 +80,14 @@ int main(int argc, char **argv)
 	graphics->initialize(window.windowWidth(), window.windowHeight(), fontResource);
 	graphics->refreshBOINCInformation();
 	
-#ifdef NDEBUG
-	// switch to fullscreen when in release mode (on windoze: after init!)
-	window.toggleFullscreen();
-#endif
+	// check optional command line parameter
+	if(argc == 2) {
+		string param(argv[1]);
+		if(param == "--fullscreen") {
+			// switch to fullscreen (on windoze: after init!)
+			window.toggleFullscreen();
+		}
+	}
 
 	// enter main event loop
 	window.eventLoop();