diff --git a/Intro.cpp b/Intro.cpp
index a37375a9..a71f6e16 100644
--- a/Intro.cpp
+++ b/Intro.cpp
@@ -184,13 +184,20 @@ BOOLEAN EnterIntroScreen()
 	// Don't play music....
 	SetMusicMode( MUSIC_NONE );
 
-#ifdef JA2BETAVERSION
-	if( FileExists( "..\\NoIntro.txt" ) )
+	// WANNE: No we have an INI option for the choise if the intro should be played
+	if (!iPlayIntro)
 	{
 		PrepareToExitIntroScreen();
 		return( TRUE );
 	}
-#endif
+
+//#ifdef JA2BETAVERSION
+//	if( FileExists( "..\\NoIntro.txt" ) )
+//	{
+//		PrepareToExitIntroScreen();
+//		return( TRUE );
+//	}
+//#endif
 
 	//if the library doesnt exist, exit
 	if( !IsLibraryOpened( LIBRARY_INTRO ) )
diff --git a/SCREENS.cpp b/SCREENS.cpp
index b51c52c0..bb500a1c 100644
--- a/SCREENS.cpp
+++ b/SCREENS.cpp
@@ -5,6 +5,7 @@
 #endif
 
 int iResolution;		// INI file
+int iPlayIntro;
 /* WANNE, Sgt.Kolja
  * INI file (Windowed or Fullscreen) 
  * REPLACE all defines WINDOWED_MODE with this variable
diff --git a/Standard Gaming Platform/sgp.cpp b/Standard Gaming Platform/sgp.cpp
index 3d6bc803..2f7e629b 100644
--- a/Standard Gaming Platform/sgp.cpp	
+++ b/Standard Gaming Platform/sgp.cpp	
@@ -1036,6 +1036,9 @@ void GetRuntimeSettings( )
   /* 1 for Windowed, 0 for Fullscreen */
   if( !bScreenModeCmdLine )
     iScreenMode = (int) GetPrivateProfileInt( "Ja2 Settings","SCREEN_MODE_WINDOWED", iScreenMode, INIFile );
+
+	// WANNE: Should we play the intro?
+	iPlayIntro = (int) GetPrivateProfileInt( "Ja2 Settings","PLAY_INTRO", iPlayIntro, INIFile );
 }
 
 void ShutdownWithErrorBox(CHAR8 *pcMessage)
diff --git a/local.h b/local.h
index 35c27896..50ea64a3 100644
--- a/local.h
+++ b/local.h
@@ -29,6 +29,7 @@ extern UINT16  SCREEN_WIDTH;
 extern UINT16  SCREEN_HEIGHT;
 
 extern int iResolution;			// Resolution id from the ini file
+extern int iPlayIntro;
 extern INT16 iScreenWidthOffset;
 extern INT16 iScreenHeightOffset;