diff --git a/polymer/eduke32/rsrc/eduke32.manifest b/polymer/eduke32/rsrc/eduke32.manifest
new file mode 100755
index 000000000..7b68b5151
--- /dev/null
+++ b/polymer/eduke32/rsrc/eduke32.manifest
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    name="EDuke32"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>EDuke32</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index f903bac16..3347f3688 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -8386,26 +8386,10 @@ void loadtmb(void)
     kclose(fil);
 }
 
-/*
-===================
-=
-= ShutDown
-=
-===================
-*/
-
-void Shutdown( void )
+void freeconmem(void)
 {
     int i;
 
-    SoundShutdown();
-    MusicShutdown();
-    uninittimer();
-    uninitengine();
-    CONTROL_Shutdown();
-    CONFIG_WriteSetup();
-    KB_Shutdown();
-
     for(i=0;i<MAXQUOTES;i++)
     {
         if(fta_quotes[i] != NULL)
@@ -8430,6 +8414,28 @@ void Shutdown( void )
         Bfree(labelcode);
 }
 
+/*
+===================
+=
+= ShutDown
+=
+===================
+*/
+
+void Shutdown( void )
+{
+    int i;
+
+    SoundShutdown();
+    MusicShutdown();
+    uninittimer();
+    uninitengine();
+    CONTROL_Shutdown();
+    CONFIG_WriteSetup();
+    KB_Shutdown();
+    freeconmem();
+}
+
 /*
 ===================
 =
@@ -8526,6 +8532,7 @@ void Startup(void)
     if (initengine()) {
         wm_msgbox("Build Engine Initialisation Error",
                   "There was a problem initialising the Build engine: %s", engineerrstr);
+        freeconmem();
         exit(1);
     }
 
@@ -8533,6 +8540,7 @@ void Startup(void)
     if (i < 0 || ForceSetup || CommandSetup) {
         if (!startwin_run()) {
             uninitengine();
+            freeconmem();
             exit(0);
         }
     }
diff --git a/polymer/eduke32/source/misc/buildres.rc b/polymer/eduke32/source/misc/buildres.rc
index 22c1ef82c..d92bf07dc 100644
--- a/polymer/eduke32/source/misc/buildres.rc
+++ b/polymer/eduke32/source/misc/buildres.rc
@@ -1,6 +1,8 @@
 #include <windows.h>
 #include <commctrl.h>
 #include "startwin.editor.h"
+
+1 24 "rsrc/eduke32.manifest"
 
 RSRC_ICON ICON "rsrc/build_icon.ico"
 RSRC_BMP BITMAP "rsrc/build.bmp"
diff --git a/polymer/eduke32/source/misc/gameres.rc b/polymer/eduke32/source/misc/gameres.rc
index 4f720717e..5fec43d25 100644
--- a/polymer/eduke32/source/misc/gameres.rc
+++ b/polymer/eduke32/source/misc/gameres.rc
@@ -1,6 +1,8 @@
 #include <windows.h>
 #include <commctrl.h>
 #include "startwin.game.h"
+
+1 24 "rsrc/eduke32.manifest"
 
 RSRC_ICON ICON "rsrc/game_icon.ico"
 RSRC_ICON+1 ICON "rsrc/game_icon.ico"