diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 33919afc8..a3492e313 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+November 3, 2009
+- Added a command line option -warpwipe to perform the screen wipe if you
+  start with -warp or +map.
+
 October 31, 2009
 - Changed all coordinates for DrawTexture() to floating point so that the
   player sprites will retain the same precision they had when they were
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 801262790..cad92cce6 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2071,7 +2071,10 @@ void D_DoomMain (void)
 		if (autostart || netgame)
 		{
 			// Do not do any screenwipes when autostarting a game.
-			NoWipe = 35;
+			if (!Args->CheckParm("-warpwipe"))
+			{
+				NoWipe = TICRATE;
+			}
 			CheckWarpTransMap (startmap, true);
 			if (demorecording)
 				G_BeginRecording (startmap);