diff --git a/Assets/gamedb/gamedb.txt b/Assets/gamedb/gamedb.txt
index 38c2b60573..05cae0deb3 100644
--- a/Assets/gamedb/gamedb.txt
+++ b/Assets/gamedb/gamedb.txt
@@ -28,6 +28,7 @@
 #include gamedb_e_cards.txt
 #include gamedb_msx1.txt
 #include gamedb_msx2.txt
+#include gamedb_vs.txt
 
 ; ************ NES / Famicom ************
 
@@ -224,6 +225,7 @@ sha1:E8BDD327FA96576F501914BDF455C477EC2A20B4	B	AV Mahjongg (Hacker) [b1]	NES		b
 sha1:E816367A8CAC2AC470CEEBA8C8DC00CEC8C7009E	T	AV Mahjongg (Hacker) [T+Chi][a1]	NES		board=MAPPER066;WRAM=0;PAD_H=0;PAD_V=1
 
 
+
 ;;;;;;;;;;;;;;;;;;;-----------------------------------------------------------------------
 
 ;;;;;;;;;;;;;;;;;;;-----------------------------------------------------------------------
@@ -316,8 +318,6 @@ EDD7A45A7F27E396B6D686F1861642D509863132		Datach SD Gundam Gundam Wars	NES		boar
 6F3C65BD945FE13305A7A39D8CD884A5BF314A8F		Datach Crayon Shin Chan Ora to Poi Poi	NES		board=MAPPER157
 1218C891DEE878C18D31D38D07CAD5FB06B3B2CE		Datach Yuu Yuu akusho Baktutou	NES		board=MAPPER157
   
-
-
 #include gamedb_goodnes.txt
 
 
diff --git a/Assets/gamedb/gamedb_vs.txt b/Assets/gamedb/gamedb_vs.txt
index 90e351481f..a9c4bb679d 100644
--- a/Assets/gamedb/gamedb_vs.txt
+++ b/Assets/gamedb/gamedb_vs.txt
@@ -70,7 +70,7 @@ sha1:DD09C4FD6B440FBA948A5DC5269F5302A4DE75A2	B	VS. Super Mario Bros. (VS) [b1][
 sha1:3E73109098A478F6AC3EA3CCCCA19BA3A31010C6	B	VS. Super Mario Bros. (VS) [b2]	NES		board=MAPPER099;system=VS;
 sha1:0C538B47CBB6CE03988B80ACF8A9AFEB68A6A179	B	VS. Super Mario Bros. (VS) [b3]	NES		board=MAPPER099;system=VS;
 sha1:EB9E0F838B4688C241B30516BE132E723EA21044	O	VS. Super Mario Bros. (VS) [o1]	NES		board=MAPPER099;system=VS;
-sha1:B21AA940728ED80C72EE23C251C96E42CC84B2D6	U	VS. Super Mario Bros. (VS)	NES		board=MAPPER099;system=VS;palette=2C04-4;
+sha1:B21AA940728ED80C72EE23C251C96E42CC84B2D6	G	zzzzz VS. Super Mario Bros. (VS)	NES		board=MAPPER099;system=VS;palette=2C04-4;
 sha1:D7AB201265390588AB3CF3C2BB6B72BEA3F97137	B	Super Xevious - Gump no Nazo (VS) [b1]	NES		board=MAPPER001;system=VS;
 sha1:E291969D53D245E2E4F932D16E61B7DDE2E2570F	B	Super Xevious - Gump no Nazo (VS) [b2]	NES		board=MAPPER001;system=VS;
 sha1:881B6413FBCBFB9A0308583F0510C09283A72D2A	U	Super Xevious - Gump no Nazo (VS)	NES		board=MAPPER002;system=VS;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs
index 7741bb9776..b3cb24a24c 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs
@@ -455,6 +455,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			public string system;
 			public List<string> chips = new List<string>();
 
+			public string palette; // Palette override for VS system
+
 			public override string ToString()
 			{
 				return string.Format("pr={1},ch={2},wr={3},vr={4},ba={5},pa={6}|{7},brd={8},sys={9}", board_type, prg_size, chr_size, wram_size, vram_size, wram_battery ? 1 : 0, pad_h, pad_v, board_type, system);
@@ -566,6 +568,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			if (dict.ContainsKey("BATT"))
 				cart.wram_battery = bool.Parse(dict["BATT"]);
 
+			if(dict.ContainsKey("palette"))
+			{
+				cart.palette = dict["palette"];
+			}
+
 			return cart;
 		}
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
index 013c149bf9..0053082aa4 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
@@ -939,9 +939,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 		}
 
 		// the palette for each VS game needs to be chosen explicitly since there are 6 different ones.
-		public void PickVSPalette(GameInfo game)
+		public void PickVSPalette(CartInfo cart)
 		{
-			switch (game.OptionValue("palette"))
+			switch (cart.palette)
 			{
 				case "2C05": SetPalette(Palettes.palette_2c03_2c05); break;
 				case "2C04-1": SetPalette(Palettes.palette_2c04_001); break;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
index 9637022cf1..61577a744c 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
@@ -61,7 +61,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			// TODO: What if settings are later loaded?
 			if (_isVS)
 			{
-				PickVSPalette(game);
+				PickVSPalette(cart);
 			}