diff --git a/src/keyboard_at.c b/src/keyboard_at.c
index 76aaadc51..1d771052a 100644
--- a/src/keyboard_at.c
+++ b/src/keyboard_at.c
@@ -8,7 +8,7 @@
  *
  *		Intel 8042 (AT keyboard controller) emulation.
  *
- * Version:	@(#)keyboard_at.c	1.0.10	2017/11/23
+ * Version:	@(#)keyboard_at.c	1.0.11	2017/12/25
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -981,7 +981,9 @@ bad_command:
 					case ROM_AP53:
 					case ROM_P55T2S:
 					case ROM_S1668:
+#ifdef GREENB
 					case ROM_4GPV31:
+#endif
 						/*Set extended controller RAM*/
 						kbdlog("ATkbd: set extended controller RAM\n");
 						kbd->want60 = 1;
diff --git a/src/nvr_ps2.c b/src/nvr_ps2.c
index b51aab515..a9a0ab979 100644
--- a/src/nvr_ps2.c
+++ b/src/nvr_ps2.c
@@ -68,7 +68,9 @@ static void *ps2_nvr_init(device_t *info)
         switch (romset)
         {
                 case ROM_IBMPS2_M80:  f = nvr_fopen(L"ibmps2_m80_sec.nvr", L"rb"); break;
+#ifdef WALTJE
                 case ROM_IBMPS2_M80_486:  f = nvr_fopen(L"ibmps2_m80-486_sec.nvr", L"rb"); break;
+#endif
         }
         if (f)
         {
@@ -89,7 +91,9 @@ void ps2_nvr_close(void *p)
         switch (romset)
         {
                 case ROM_IBMPS2_M80:  f = nvr_fopen(L"ibmps2_m80_sec.nvr", L"wb"); break;
+#ifdef WALTJE
                 case ROM_IBMPS2_M80_486:  f = nvr_fopen(L"ibmps2_m80-486_sec.nvr", L"wb"); break;
+#endif
         }
         if (f)
         {
diff --git a/src/rom.c b/src/rom.c
index 50e192220..1aea0dfc6 100644
--- a/src/rom.c
+++ b/src/rom.c
@@ -13,7 +13,7 @@
  *		- c386sx16 BIOS fails checksum
  *		- the loadfont() calls should be done elsewhere
  *
- * Version:	@(#)rom.c	1.0.20	2017/12/04
+ * Version:	@(#)rom.c	1.0.21	2017/12/25
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -799,7 +799,9 @@ rom_load_bios(int rom_id)
 		return(1);
 
 	case ROM_IBMPS2_M80:
+#ifdef WALTJE
 	case ROM_IBMPS2_M80_486:
+#endif
 		if (! rom_load_interleaved(
 			L"roms/machines/ibmps2_m80/15f6637.bin",
 			L"roms/machines/ibmps2_m80/15f6639.bin",
@@ -807,11 +809,13 @@ rom_load_bios(int rom_id)
 		biosmask = 0x1ffff;
 		return(1);
 
+#ifdef GREENB
 	case ROM_4GPV31:
 		if (! rom_load_linear(
 			L"roms/machines/green-b/4gpv31-ami-1993-8273517.bin",
 			0x000000, 65536, 0, rom)) break;
 		return(1);
+#endif
 
 	default:
 		pclog("ROM: don't know how to handle ROM set %d !\n", rom_id);