diff --git a/src/conio/GNUmakefile b/src/conio/GNUmakefile
index e14fb74d392ca97034722128c298ed92dfcdfd0c..82e045acbc9f43a535999df5204e0f31d4b05182 100644
--- a/src/conio/GNUmakefile
+++ b/src/conio/GNUmakefile
@@ -71,7 +71,7 @@ $(EXEODIR)$(DIRSEP)genmap$(EXEFILE): $(EXEODIR)
 
 rgbmap.s: $(EXEODIR)$(DIRSEP)genmap$(EXEFILE)
 	@echo Creating $@...
-	$(QUIET)$(EXEODIR)$(DIRSEP)genmap$(EXEFILE)
+	$(QUIET)$(EXEODIR)$(DIRSEP)genmap$(EXEFILE) $(os)
 
 rgbmap.h: rgbmap.s
 
diff --git a/src/conio/genmap.c b/src/conio/genmap.c
index 96916e8c11f000461f0e8933ff67087059b9f5bb..ef71103749cdd4047e4671c3b01cd56cd76d74ed 100644
--- a/src/conio/genmap.c
+++ b/src/conio/genmap.c
@@ -1,5 +1,7 @@
 #include <stdio.h>
+#include <string.h>
 #include <inttypes.h>
+
 uint32_t r2y[16777216];
 uint32_t y2r[16777216];
 
@@ -58,20 +60,21 @@ main(int argc, char **argv)
 	FILE *h = fopen("rgbmap.h", "w");
 	FILE *r = fopen("r2y.bin", "wb");
 	FILE *y = fopen("y2r.bin", "wb");
+	char *mangle = "";
+
 	init_r2y();
+	if (argc > 1 && strcmp(argv[1], "win32") == 0)
+		mangle = "_";
 
 	fprintf(s,
 	    ".section .rodata\n"
-	    ".global r2y\n"
-	    ".type   r2y, @object\n"
+	    ".global %sr2y\n"
+	    ".global %sy2r\n"
 	    ".align  4\n"
-	    "r2y:\n"
+	    "%sr2y:\n"
 	    "	.incbin \"r2y.bin\"\n"
-	    ".global y2r\n"
-	    ".type   y2r, @object\n"
-	    ".align  4\n"
-	    "y2r:\n"
-	    "	.incbin \"y2r.bin\"\n");
+	    "%sy2r:\n"
+	    "	.incbin \"y2r.bin\"\n", mangle, mangle, mangle, mangle);
 	fprintf(h,
 	    "#ifndef RGBMAP_H\n"
 	    "#define RGBMAP_H\n"
diff --git a/src/syncterm/COMPILING b/src/syncterm/COMPILING
index 3c4cb0b95860ea795b2592df585e6643e8c2d0b6..581b7bf8c15479a115439e93b1c90c27eef5f12a 100644
--- a/src/syncterm/COMPILING
+++ b/src/syncterm/COMPILING
@@ -46,7 +46,7 @@ with the following command:
 hdiutil convert ~/Desktop/SyncTERM.dmg -format UDRO -o /Volumes/Synchronet/sbbs/web/root/syncterm.bbsdev.net/SyncTERM.dmg -ov
 
 Release builds for Win32 using MinGW32 use the following command line:
-gmake CC=mingw32-gcc VERBOSE=please AR=mingw32-ar RANLIB=mingw32-ranlib RELEASE=1 CXX=mingw32-g++ WINDRES=mingw32-windres
+gmake CC=mingw32-gcc VERBOSE=please AR=mingw32-ar AS=mingw32-as RANLIB=mingw32-ranlib RELEASE=1 CXX=mingw32-g++ WINDRES=mingw32-windres
 
 Release builds of jsdoor (not related at all)
-gmake jsdoor NO_LD_RUN_PATH=dumbass CC=mingw32-gcc VERBOSE=please AR=mingw32-ar RANLIB=mingw32-ranlib RELEASE=1 CXX=mingw32-g++ WINDRES=mingw32-windres JSLIBDIR=../../3rdp/win32.release/mozjs/bin/ JSINCLUDE=../../3rdp/win32.release/mozjs/include/ JSLIB=mozjs
+gmake jsdoor NO_LD_RUN_PATH=dumbass CC=mingw32-gcc VERBOSE=please AR=mingw32-ar AS=mingw32-as RANLIB=mingw32-ranlib RELEASE=1 CXX=mingw32-g++ WINDRES=mingw32-windres JSLIBDIR=../../3rdp/win32.release/mozjs/bin/ JSINCLUDE=../../3rdp/win32.release/mozjs/include/ JSLIB=mozjs