diff --git a/src/GameState.cpp b/src/GameState.cpp
index 4c526b150b..f400402594 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -321,6 +321,7 @@ void GameState::Reset()
 
 	m_bBackedOutOfFinalStage = false;
 	m_bEarnedExtraStage = false;
+	m_bDopefish = false;
 	ApplyCmdline();
 }
 
diff --git a/src/GameState.h b/src/GameState.h
index 56625a888c..00a10baed5 100644
--- a/src/GameState.h
+++ b/src/GameState.h
@@ -338,6 +338,8 @@ public:
 	float GetGoalPercentComplete( PlayerNumber pn );
 	bool IsGoalComplete( PlayerNumber pn )	{ return GetGoalPercentComplete( pn ) >= 1; }
 
+	bool m_bDopefish;
+
 	// Lua
 	void PushSelf( lua_State *L );
 
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index bc9837ac17..8d5b893bc2 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -1041,6 +1041,9 @@ int main(int argc, char* argv[])
 
 	GAMESTATE	= new GameState;
 
+	if( GetCommandlineArgument("dopefish") )
+		GAMESTATE->m_bDopefish = true;
+
 	// This requires PREFSMAN, for PREFSMAN->m_bShowLoadingWindow.
 	LoadingWindow *pLoadingWindow = LoadingWindow::Create();
 	if(pLoadingWindow == NULL)
@@ -1125,7 +1128,7 @@ int main(int argc, char* argv[])
 		ShutdownGame();
 		return 0;
 	}
-	
+
 	StartDisplay();
 
 	StoreActualGraphicOptions();