diff --git a/src/d_main.c b/src/d_main.c
index 3918d8118..5227f59f8 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -844,6 +844,10 @@ static void IdentifyVersion(void)
 	// Add our crappy patches to fix our bugs
 	// D_AddFile(va(pandf,srb2waddir,"patch.dta"));
 
+	// Add the thokker WAD
+	if (M_CheckParm("-nothokker") == 0)
+        D_AddFile(va(pandf,srb2waddir,"thokker.thk"));
+
 #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
 	{
 #if defined (DC) && 0
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 10605f20f..8d67d5aed 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3371,8 +3371,13 @@ void D_GameTypeChanged(INT32 lastgametype)
 				if (!cv_timelimit.changed && !cv_pointlimit.changed) // user hasn't changed limits
 				{
 					// default settings for match: timelimit 10 mins, no pointlimit
-					CV_SetValue(&cv_pointlimit, 0);
-					CV_SetValue(&cv_timelimit, 10);
+					if (M_CheckParm("-nothokker") != 0) {
+						CV_SetValue(&cv_pointlimit, 0);
+						CV_SetValue(&cv_timelimit, 10);
+					} else {
+						CV_SetValue(&cv_pointlimit, 3);
+						CV_SetValue(&cv_timelimit, 0);
+					}
 				}
 				if (!cv_itemrespawntime.changed)
 					CV_Set(&cv_itemrespawntime, cv_itemrespawntime.defaultvalue); // respawn normally