diff --git a/port/src/mpsetups.c b/port/src/mpsetups.c
index 577e14cdf..8c4f4e1be 100644
--- a/port/src/mpsetups.c
+++ b/port/src/mpsetups.c
@@ -18,9 +18,9 @@ MP Setup File Format
 	[defaultsetup{1}]
 	[numsetups{1}]
 	# setups
-	[setup_1{64}]
+	[setup_1{80}]
 	...
-	[setup_n{64}]
+	[setup_n{80}]
  */
 
 #define MPSETUP_VERSION 1
diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
index 40daa9935..f3a8b20cd 100644
--- a/src/game/mplayer/mplayer.c
+++ b/src/game/mplayer/mplayer.c
@@ -3998,7 +3998,7 @@ void mpsetupfileLoadWad(struct savebuffer *buffer, u8 version)
 		unpackWeaponSetRandomFilters(wpnRndPacked);
 	}
 
-	func0f18913c();
+	g_MpWeaponSetNum = savebufferReadBits(buffer, 8);
 
 	g_MpSetup.timelimit = savebufferReadBits(buffer, 6);
 	g_MpSetup.scorelimit = savebufferReadBits(buffer, 7);
@@ -4066,6 +4066,7 @@ void mpsetupfileSaveWad(struct savebuffer *buffer)
 
 	u64 wpnRndPacked = packWeaponSetRandomFilters();
 	savebufferOr(buffer, wpnRndPacked, 64);
+	savebufferOr(buffer, g_MpWeaponSetNum, 8);
 
 	savebufferOr(buffer, g_MpSetup.timelimit, 6);
 	savebufferOr(buffer, g_MpSetup.scorelimit, 7);