diff --git a/ref-static-makefiles/make_em/Makefile b/ref-static-makefiles/make_em/Makefile
index 2328937ea..98f40de84 100644
--- a/ref-static-makefiles/make_em/Makefile
+++ b/ref-static-makefiles/make_em/Makefile
@@ -66,6 +66,7 @@ CPPSRCS	=	$(DBX_PATH)/src/dosbox.cpp \
 			$(wildcard $(DBX_PATH)/src/gui/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/gui/*.c) \
 			$(wildcard $(DBX_PATH)/src/hardware/*.cpp) \
+			$(wildcard $(DBX_PATH)/src/hardware/mame/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/hardware/parport/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/hardware/reSID/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/hardware/serialport/*.cpp) \
diff --git a/ref-static-makefiles/make_em/config.h b/ref-static-makefiles/make_em/config.h
index 79080121b..9ed4dceaa 100644
--- a/ref-static-makefiles/make_em/config.h
+++ b/ref-static-makefiles/make_em/config.h
@@ -200,7 +200,7 @@
 #define PACKAGE_NAME "dosbox-x"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "dosbox-x 0.82.10"
+#define PACKAGE_STRING "dosbox-x 0.82.22"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "dosbox-x"
@@ -209,7 +209,7 @@
 #define PACKAGE_URL "http://dosbox-x.software"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.82.10"
+#define PACKAGE_VERSION "0.82.22"
 
 /* The size of `int *', as computed by sizeof. */
 #define SIZEOF_INT_P 4
@@ -236,7 +236,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.82.10"
+#define VERSION "0.82.22"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/ref-static-makefiles/make_mgw/Makefile b/ref-static-makefiles/make_mgw/Makefile
index 3fe39144b..9b40bd681 100644
--- a/ref-static-makefiles/make_mgw/Makefile
+++ b/ref-static-makefiles/make_mgw/Makefile
@@ -8,6 +8,8 @@ RM		=	rm -f
 
 DBX_PATH	= ../..
 
+MT32 = 1
+
 CFLAGS	=	-O3 -DNDEBUG -Wstrict-overflow=0 -Wstrict-aliasing=0 -fomit-frame-pointer  -mno-ms-bitfields  -I. \
 			-I$(DBX_PATH) \
 			-I$(DBX_PATH)/include \
@@ -52,6 +54,7 @@ CPPSRCS	=	$(DBX_PATH)/src/dosbox.cpp \
 			$(wildcard $(DBX_PATH)/src/gui/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/gui/*.c) \
 			$(wildcard $(DBX_PATH)/src/hardware/*.cpp) \
+			$(wildcard $(DBX_PATH)/src/hardware/mame/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/hardware/parport/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/hardware/reSID/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/hardware/serialport/*.cpp) \
@@ -78,14 +81,38 @@ CPPSRCS	=	$(DBX_PATH)/src/dosbox.cpp \
 			$(wildcard $(DBX_PATH)/src/hardware/snd_pc98/x11/*.c) \
 			$(wildcard $(DBX_PATH)/src/ints/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/libs/gui_tk/*.cpp) \
+			$(wildcard $(DBX_PATH)/src/libs/zmbv/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/misc/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/output/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/output/direct3d/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/shell/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/xBRZ/*.cpp)
 
+CPPSRCS_MT32 = $(wildcard $(DBX_PATH)/src/mt32/*.cpp) \
+			$(wildcard $(DBX_PATH)/src/mt32/freeverb/*.cpp) \
+			$(wildcard $(DBX_PATH)/src/mt32/sha1/*.cpp)
+
+OBJS_MT32 = $(addsuffix .o,$(basename $(CPPSRCS_MT32)))
+
+CXXFLAGS_MT32 = -DC_MT32=1 -I$(DBX_PATH)/src/mt32 -I$(DBX_PATH)/src/mt32/freeverb -I$(DBX_PATH)/src/mt32/sha1
+
 OBJS = $(addsuffix .o,$(basename $(CPPSRCS)))
-LIBS = -static -lz -lpng -lm -lstdc++ $(shell sdl2-config --libs)
+LIBS = -static -lpng -lz -lm -lstdc++ $(shell sdl2-config --libs)
+
+ifeq ($(OPENGL), 1)
+	CXXFLAGS += -DC_OPENGL=1
+	ifdef WINDIR
+		LIBS += -lopengl32
+	else
+		LIBS += -lGL
+	endif
+endif
+
+ifeq ($(MT32),1)
+	CPPSRCS += $(CPPSRCS_MT32)
+	CXXFLAGS += $(CXXFLAGS_MT32)
+#	OBJS += $(OBJS_MT32)
+endif
 
 .SUFFIXES: .c.o
 .SUFFIXES: .cpp.o
@@ -103,4 +130,4 @@ $(TARGET):	$(OBJS)
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 clean:
-	rm -f $(TARGET) $(OBJS)
+	rm -f $(TARGET) $(OBJS) $(OBJS_MT32)
diff --git a/ref-static-makefiles/make_mgw/config.h b/ref-static-makefiles/make_mgw/config.h
index 8edeea7b1..e10dafe83 100644
--- a/ref-static-makefiles/make_mgw/config.h
+++ b/ref-static-makefiles/make_mgw/config.h
@@ -52,8 +52,8 @@
    */
 #define C_DIRECTSERIAL 1
 
-/* Define to 1 to use x86 dynamic cpu core */
-#define C_DYNAMIC_X86 32
+/* Define to 1 to use dynamic cpu core */
+#define C_DYNREC 1
 
 /* Define to 1 to enable fluidsynth MIDI synthesis */
 /* #undef C_FLUIDSYNTH */
@@ -198,7 +198,7 @@
 #define PACKAGE_NAME "dosbox-x"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "dosbox-x 0.82.10"
+#define PACKAGE_STRING "dosbox-x 0.82.22"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "dosbox-x"
@@ -207,7 +207,7 @@
 #define PACKAGE_URL "http://dosbox-x.software"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.82.10"
+#define PACKAGE_VERSION "0.82.22"
 
 /* The size of `int *', as computed by sizeof. */
 #define SIZEOF_INT_P 4
@@ -234,7 +234,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.82.10"
+#define VERSION "0.82.22"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index a920713f4..9915366c0 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -90,6 +90,10 @@ void GFX_OpenGLRedrawScreen(void);
 #endif
 
 #if defined(WIN32) && defined(__MINGW32__) /* MinGW does not have IID_ITaskbarList3 */
+#if _WIN32_WINNT < 0x0601
+//This is undefined in some older MinGW winapi headers. --yksoft1
+static const GUID CLSID_TaskbarList ={ 0x56FDF344,0xFD6D,0x11d0,{0x95,0x8A,0x00,0x60,0x97,0xC9,0xA0,0x90}};
+#endif
 static const GUID __my_IID_ITaskbarList3 = { 0xEA1AFB91ul,0x9E28u,0x4B86u,0x90u,0xE9u,0x9Eu,0x9Fu,0x8Au,0x5Eu,0xEFu,0xAFu };
 # define IID_ITaskbarList3 __my_IID_ITaskbarList3
 #endif
diff --git a/src/hardware/hardware.cpp b/src/hardware/hardware.cpp
index 0a3947fa0..cf49c8e77 100644
--- a/src/hardware/hardware.cpp
+++ b/src/hardware/hardware.cpp
@@ -33,6 +33,7 @@
 #include "cross.h"
 
 #if (C_SSHOT)
+#include <zlib.h>
 #include <png.h>
 #include "../libs/zmbv/zmbv.h"
 #endif