diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 224869d37..23b41fc07 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -49,7 +49,8 @@ ifneq (0,$(RELEASE))
 else
 	# Debugging enabled
     debug=-ggdb -O0 -DDEBUGGINGAIDS -fstack-protector-all
-    LIBS=-lm -lssp -Wl,--enable-auto-import
+    LIBS=-lm 
+
     ifneq (0,$(KRANDDEBUG))
       debug+=-fno-inline -fno-inline-functions -fno-inline-functions-called-once
       debug+=-DKRANDDEBUG=1
@@ -87,6 +88,7 @@ include $(EROOT)/Makefile.shared
 ifeq ($(PLATFORM),WINDOWS)
     OBJ=obj_win
     EOBJ=eobj_win
+    LIBS+= -lssp -Wl,--enable-auto-import
 else
     LIBS+= -ldl -pthread
     ifeq (1,$(PROFILER))
diff --git a/polymer/eduke32/build/include/compat.h b/polymer/eduke32/build/include/compat.h
index 9122fd6e7..d0624dc99 100644
--- a/polymer/eduke32/build/include/compat.h
+++ b/polymer/eduke32/build/include/compat.h
@@ -387,12 +387,14 @@ int32_t		Bclosedir(BDIR *dir);
 # define Brealloc nedrealloc
 # define Bfree nedfree
 # define Bstrdup nedstrdup
+# define Bmemalign nedmemalign
 #else
 # define Bmalloc malloc
 # define Bcalloc calloc
 # define Brealloc realloc
 # define Bfree free
 # define Bstrdup strdup
+# define Bmemalign memalign
 #endif
 # define Bopen open
 # define Bclose close
diff --git a/polymer/eduke32/build/src/osd.c b/polymer/eduke32/build/src/osd.c
index 0b33f98af..ea00000e8 100644
--- a/polymer/eduke32/build/src/osd.c
+++ b/polymer/eduke32/build/src/osd.c
@@ -1848,7 +1848,7 @@ int32_t OSD_RegisterFunction(const char *name, const char *help, int32_t (*func)
             return -1;
         }
 */
-        Bfree((char *)symb->help);
+//        Bfree((char *)symb->help);
         symb->help = help;
         symb->func = func;
         return 0;
diff --git a/polymer/eduke32/source/global.c b/polymer/eduke32/source/global.c
index 8e64e0376..8c8640c2a 100644
--- a/polymer/eduke32/source/global.c
+++ b/polymer/eduke32/source/global.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "duke3d.h"
 
-const char *s_buildDate = "20100703";
+const char *s_buildDate = "20100704";
 char *MusicPtr = NULL;
 int32_t g_musicSize;
 
diff --git a/polymer/eduke32/source/sdlmusic.c b/polymer/eduke32/source/sdlmusic.c
index ab9e2a001..118232716 100644
--- a/polymer/eduke32/source/sdlmusic.c
+++ b/polymer/eduke32/source/sdlmusic.c
@@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #if !defined _WIN32  // fork/exec based external midi player
 #include <unistd.h>
-#include <malloc.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 static char **external_midi_argv;
@@ -168,7 +167,7 @@ int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
         sz = (numargs+2)*sizeof(char *) + (c-command+1);
         sz = ((sz+pagesize)/pagesize)*pagesize;
 
-        external_midi_argv = memalign(pagesize, sz);
+        external_midi_argv = Bmemalign(pagesize, sz);
         if (!external_midi_argv)
             goto fallback;