diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1f56e7da..98ab7c3fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,21 +113,23 @@ option(DEV_BRANCH   "Development branch"
 
 # Development branch features
 #
-#                      Option       Description                                     Def.    Condition       Otherwise
-#                      ------       -----------                                     ----    ---------       ---------
-cmake_dependent_option(AMD_K5       "AMD K5"                                        ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(CYRIX_6X86   "Cyrix 6x86"                                    ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(GUSMAX       "Gravis UltraSound MAX"                         ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(LASERXT      "VTech Laser XT"                                ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(MGA          "Matrox Mystique graphics adapters"             ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(NO_SIO       "Machines without emulated Super I/O chips"     ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(OLIVETTI     "Olivetti M290"                                 ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(OPEN_AT      "OpenAT"                                        ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(PAS16        "Pro Audio Spectrum 16"                         OFF     "DEV_BRANCH"    OFF)
-cmake_dependent_option(SIO_DETECT   "Super I/O Detection Helper"                    ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(VGAWONDER    "ATI VGA Wonder (ATI-18800)"                    ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(VNC          "VNC renderer"                                  OFF     "DEV_BRANCH"    OFF)
-cmake_dependent_option(XL24         "ATI VGA Wonder XL24 (ATI-28800-6)"             ON      "DEV_BRANCH"    OFF)
+#                      Option         Description                                   Def.    Condition       Otherwise
+#                      ------         -----------                                   ----    ---------       ---------
+cmake_dependent_option(AMD_K5         "AMD K5"                                      ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(CYRIX_6X86     "Cyrix 6x86"                                  ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(GUSMAX         "Gravis UltraSound MAX"                       ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(LASERXT        "VTech Laser XT"                              ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(MGA            "Matrox Mystique graphics adapters"           ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(NO_SIO         "Machines without emulated Super I/O chips"   ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(OLIVETTI       "Olivetti M290"                               ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(OPEN_AT        "OpenAT"                                      ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(PAS16          "Pro Audio Spectrum 16"                       OFF     "DEV_BRANCH"    OFF)
+cmake_dependent_option(SIO_DETECT     "Super I/O Detection Helper"                  ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(VGAWONDER      "ATI VGA Wonder (ATI-18800)"                  ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(VNC            "VNC renderer"                                OFF     "DEV_BRANCH"    OFF)
+cmake_dependent_option(XL24           "ATI VGA Wonder XL24 (ATI-28800-6)"           ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"                                 ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(ISAMEM_IAB     "Intel Above Board"                           ON      "DEV_BRANCH"    OFF)
 
 # Determine the build type
 set(RELEASE_BUILD   OFF)
diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
index 17a9ca1bb..2b7b34c7b 100644
--- a/src/device/CMakeLists.txt
+++ b/src/device/CMakeLists.txt
@@ -21,4 +21,12 @@ add_library(dev OBJECT bugger.c cassette.c cartridge.c hasp.c hwm.c hwm_lm75.c h
 
 if(LASERXT)
     target_compile_definitions(dev PRIVATE USE_LASERXT)
+endif()
+
+if(ISAMEM_RAMPAGE)
+    target_compile_definitions(dev PRIVATE USE_ISAMEM_RAMPAGE)
+endif()
+
+if(ISAMEM_IAB)
+    target_compile_definitions(dev PRIVATE USE_ISAMEM_IAB)
 endif()
\ No newline at end of file
diff --git a/src/device/isamem.c b/src/device/isamem.c
index 7ca12db14..b16d5d247 100644
--- a/src/device/isamem.c
+++ b/src/device/isamem.c
@@ -1075,7 +1075,7 @@ static const device_config_t rampage_config[] =
 	}
 };
 
-static const device_t isamem_rampage_device = {
+static const device_t rampage_device = {
     "AST RAMpage/XT",
     DEVICE_ISA,
     ISAMEM_RAMPAGEXT_CARD,
@@ -1177,7 +1177,7 @@ static const device_config_t iab_config[] =
 	}
 };
 
-static const device_t isamem_iab_device = {
+static const device_t iab_device = {
     "Intel AboveBoard",
     DEVICE_ISA,
     ISAMEM_ABOVEBOARD_CARD,
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index de29effc5..9ee608c4f 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -69,6 +69,12 @@ ifeq ($(DEV_BUILD), y)
  ifndef XL24
   XL24		:= y
  endif
+ ifndef ISAMEM_RAMPAGE
+  ISAMEM_RAMPAGE := y
+ endif
+ ifndef ISAMEM_IAB
+  ISAMEM_IAB := y
+ endif
  ifndef OLIVETTI
   OLIVETTI	:= y
  endif
@@ -118,6 +124,12 @@ else
  ifndef XL24
   XL24		:= n
  endif
+ ifndef ISAMEM_RAMPAGE
+  ISAMEM_RAMPAGE := n
+ endif
+ ifndef ISAMEM_IAB
+  ISAMEM_IAB := n
+ endif
  ifndef OLIVETTI
   OLIVETTI	:= n
  endif
@@ -450,6 +462,14 @@ ifeq ($(XL24), y)
 OPTS		+= -DUSE_XL24
 endif
 
+ifeq ($(ISAMEM_RAMPAGE), y)
+OPTS        += -DUSE_ISAMEM_RAMPAGE
+endif
+
+ifeq ($(ISAMEM_IAB), y)
+OPTS        += -DUSE_ISAMEM_IAB
+endif
+
 ifeq ($(OLIVETTI), y)
 OPTS		+= -DUSE_OLIVETTI
 DEVBROBJ	+= olivetti_eva.o