diff --git a/code/tools/asm/Makefile b/code/tools/asm/Makefile
index 67bfbd48..ec314f11 100644
--- a/code/tools/asm/Makefile
+++ b/code/tools/asm/Makefile
@@ -1,5 +1,12 @@
 # yeah, couldn't do more simple really
 
+PLATFORM=$(shell uname|sed -e s/_.*//|tr A-Z a-z)
+ifeq ($(PLATFORM),mingw32)
+  BINEXT=.exe
+else
+  BINEXT=
+endif
+
 CC=gcc
 CFLAGS=-O2 -Wall -Werror -fno-strict-aliasing
 
@@ -12,7 +19,7 @@ clean:
 	rm -f q3asm *~ *.o
 
 install: default
-	install -s -m 0755 q3asm ../
+	install -s -m 0755 q3asm$(BINEXT) ../
 
 uninstall:
-	-rm ../q3asm
+	-rm ../q3asm$(BINEXT)
diff --git a/code/tools/lcc/makefile b/code/tools/lcc/makefile
index 178e86c3..1c29f327 100644
--- a/code/tools/lcc/makefile
+++ b/code/tools/lcc/makefile
@@ -3,7 +3,14 @@ HOSTFILE=etc/linux.c
 TEMPDIR=/tmp
 A=.a
 O=.o
-E=
+
+PLATFORM=$(shell uname|sed -e s/_.*//|tr A-Z a-z)
+ifeq ($(PLATFORM),mingw32)
+  E=.exe
+else
+  E=
+endif
+
 CC=gcc
 CFLAGS=-O2 -Wall -fno-strict-aliasing
 LDFLAGS=