diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index 07b1aa125..c18d35066 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -201,9 +201,8 @@ machine_at_neat_ami_init(const machine_t *model)
     return ret;
 }
 
-#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
 int
-machine_at_micronics386_init(const machine_t *model)
+machine_at_goldstar386_init(const machine_t *model)
 {
     int ret;
 
@@ -221,7 +220,26 @@ machine_at_micronics386_init(const machine_t *model)
 
     return ret;
 }
-#endif
+
+int
+machine_at_micronics386_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved(L"roms/machines/micronics386/386-Micronics-09-00021-EVEN.BIN",
+				L"roms/machines/micronics386/386-Micronics-09-00021-ODD.BIN",
+				0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_init(model);
+
+    device_add(&neat_device);
+    device_add(&fdc_at_device);
+
+    return ret;
+}
 
 static void
 machine_at_scat_init(const machine_t *model, int is_v4)
diff --git a/src/machine/machine.h b/src/machine/machine.h
index e72c02d21..5c9e71f2d 100644
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -188,9 +188,10 @@ extern int	machine_at_headlandquadtel_init(const machine_t *);
 
 extern int	machine_at_neat_init(const machine_t *);
 extern int	machine_at_neat_ami_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
-extern int	machine_at_goldstar386_init(const machine_t *); //Neat based Phoenix 80386 board. It has memory related issues.
-#endif
+
+extern int	machine_at_goldstar386_init(const machine_t *);
+extern int	machine_at_micronics386_init(const machine_t *);
+
 
 extern int	machine_at_award286_init(const machine_t *);
 extern int	machine_at_gw286ct_init(const machine_t *);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index c62b46928..56e413f71 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -130,9 +130,9 @@ const machine_t machines[] = {
 
     { "[386SX MCA] IBM PS/2 model 55SX",	"ibmps2_m55sx",		{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO,						  1,    8,   1,  63,	  machine_ps2_model_55sx_init, NULL			},
 
-#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
     { "[386SX ISA] Goldstar 386",		"goldstar386",		{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC,								512, 8192, 128, 127,		 machine_at_goldstar386_init, NULL			},
-#endif
+    { "[386SX ISA] Unknown Micronics 386 Board",		"micronics386",		{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC,								512, 8192, 128, 127,		 machine_at_micronics386_init, NULL			},
+
 
     { "[386DX ISA] AMI 386DX clone",		"ami386dx",		{{"Intel", cpus_i386DX},      {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC,						  1,   32,   1, 127,	  machine_at_opti495_ami_init, NULL			},
     { "[386DX ISA] Award 386DX clone",		"award386dx",		{{"Intel", cpus_i386DX},      {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC,						  1,   32,   1, 127,	      machine_at_opti495_init, NULL			},
diff --git a/src/machine/machine_table_new.c b/src/machine/machine_table_new.c
index bf3204e73..8d8c7c57e 100644
--- a/src/machine/machine_table_new.c
+++ b/src/machine/machine_table_new.c
@@ -115,9 +115,9 @@ const machine_t machines[] = {
     { "[386SX ISA] IBM PS/1 m.2121+ISA",	"ibmps1_2121_isa",	{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO,				  1,    6,   1,  63,	       machine_ps1_m2121_init, NULL			},
     { "[386SX ISA] KMX-C-02",			"kmxc02",		{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_AT,										512,16384, 512, 127,	       machine_at_kmxc02_init, NULL			},
 
-#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
     { "[386SX ISA] Goldstar 386",		"goldstar386",		{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC,								512, 8192, 128, 127,		 machine_at_goldstar386_init, NULL			},
-#endif
+    { "[386SX ISA] Unknown Micronics 386 Board",		"micronics386",		{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC,								512, 8192, 128, 127,		 machine_at_micronics386_init, NULL			},
+
 
     { "[386SX MCA] IBM PS/2 model 55SX",	"ibmps2_m55sx",		{{"Intel", cpus_i386SX},      {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"",      NULL},     {"",      NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO,						  1,    8,   1,  63,	  machine_ps2_model_55sx_init, NULL			},
 
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 465baab1d..a01fd5e40 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -83,9 +83,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef VECTRA54
   VECTRA54	:= y
  endif
- ifndef GOLDSTAR386
-  GOLDSTAR386	:= y
- endif
  ifndef SIEMENS
   SIEMENS	:= y
  endif
@@ -150,9 +147,6 @@ else
  ifndef VECTRA54
   VECTRA54	:= n
  endif
- ifndef GOLDSTAR386
-  GOLDSTAR386	:= n
- endif
  ifndef SIEMENS
   SIEMENS	:= n
  endif
@@ -512,10 +506,6 @@ ifeq ($(VECTRA54), y)
 OPTS		+= -DUSE_VECTRA54
 endif
 
-ifeq ($(GOLDSTAR386), y)
-OPTS		+= -DUSE_GOLDSTAR386
-endif
-
 ifeq ($(SIEMENS), y)
 OPTS		+= -DUSE_SIEMENS
 endif
diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw
index c49e62387..ad11c5d30 100644
--- a/src/win/Makefile_ndr.mingw
+++ b/src/win/Makefile_ndr.mingw
@@ -83,9 +83,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef VECTRA54
   VECTRA54	:= y
  endif
- ifndef GOLDSTAR386
-  GOLDSTAR386	:= y
- endif
  ifndef SIEMENS
   SIEMENS	:= y
  endif
@@ -150,9 +147,6 @@ else
  ifndef VECTRA54
   VECTRA54	:= n
  endif
- ifndef GOLDSTAR386
-  GOLDSTAR386	:= n
- endif
  ifndef SIEMENS
   SIEMENS	:= n
  endif
@@ -518,10 +512,6 @@ ifeq ($(VECTRA54), y)
 OPTS		+= -DUSE_VECTRA54
 endif
 
-ifeq ($(GOLDSTAR386), y)
-OPTS		+= -DUSE_GOLDSTAR386
-endif
-
 ifeq ($(SIEMENS), y)
 OPTS		+= -DUSE_SIEMENS
 endif