diff --git a/default.cbd b/default.cbd
index a3e4d36dd..55d477e79 100644
--- a/default.cbd
+++ b/default.cbd
@@ -155,7 +155,7 @@ ${COMPILER} "autostart.cpp a.nas blocks.nas misc.nas tmap.nas tmap2.nas tmap3.na
  p_xlat.cpp po_man.cpp r_bsp.cpp r_data.cpp r_draw.cpp r_drawt.cpp r_main.cpp \
  r_plane.cpp r_segs.cpp r_sky.cpp r_things.cpp r_polymost.cpp s_advsound.cpp \
  s_environment.cpp s_playlist.cpp s_sndseq.cpp s_sound.cpp sc_man.cpp skins.cpp \
- st_stuff.cpp stats.cpp stringtable.cpp tables.cpp tempfiles.cpp thingdef.cpp thingdef_codeptr.cpp \
+ st_stuff.cpp stats.cpp stringtable.cpp tables.cpp tempfiles.cpp thingdef.cpp thingdef_codeptr.cpp thingdef_exp.cpp \
  v_collection.cpp v_draw.cpp v_font.cpp v_palette.cpp v_pfx.cpp v_text.cpp \
  v_video.cpp vectors.cpp name.cpp zstring.cpp zstringpool.cpp zstrformat.cpp \
  w_wad.cpp wi_stuff.cpp a_arachnotron.cpp a_archvile.cpp a_bossbrain.cpp \
diff --git a/tools/makewad/Makefile.mgw b/tools/makewad/Makefile.mgw
index 81bedff5c..cffdbedda 100644
--- a/tools/makewad/Makefile.mgw
+++ b/tools/makewad/Makefile.mgw
@@ -1,10 +1,18 @@
-EXE = makewad.exe
+ifeq (Windows_NT,$(OS))
+  EXE = makewad.exe
+  CCDV = @../../ccdv
+  CFLAGS = -Os -Wall -fomit-frame-pointer
+  LDFLAGS = -L../../zlib/ -lz
+else
+  EXE = makewad
+  CCDV = 
+  CFLAGS = -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -Os -Wall -fomit-frame-pointer
+  LDFLAGS = -lz
+endif
 
-CCDV = @../../ccdv
 CC = gcc
-CFLAGS = $(LOC) -Os -Wall -fomit-frame-pointer
 
-OBJS = makewad.o
+OBJS = makewad.o ioapi.o zip.o
 
 all: $(EXE)
 
@@ -12,12 +20,15 @@ all: $(EXE)
 	$(CCDV) $(CC) $(CFLAGS) -c -o $@ $<
 
 $(EXE): $(OBJS)
-	$(CCDV) $(CC) -o $(EXE) $(OBJS)
+	$(CCDV) $(CC) $(LDFLAGS) -o $(EXE) $(OBJS)
 
 .PHONY: clean
 
 clean:
+ifeq (Windows_NT,$(OS))
 	-del /q /f $(EXE) 2>nul
 	-del /q /f *.o 2>nul
-
-makewad.o: makewad.c
+else
+	-rm -f $(EXE)
+	-rm -f *.o
+endif
diff --git a/wadsrc/wadmake b/wadsrc/wadmake
deleted file mode 100644
index 314e01b2a..000000000
--- a/wadsrc/wadmake
+++ /dev/null
@@ -1,129 +0,0 @@
-zdoom.wad: zdoom.lst \
-	invgemr2.lmp \
-	invgemr1.lmp \
-	invgeml2.lmp \
-	invgeml1.lmp \
-	artibox.png \
-	selectbo.png \
-	fiteface.lmp \
-	mageface.lmp \
-	clerface.lmp \
-	hamoback.png \
-	decals/decaldef.txt \
-	decals/blast1.png \
-	decals/cbalscr1.png \
-	decals/cbalscr2.png \
-	decals/bal7scr1.png \
-	decals/bal7scr2.png \
-	decals/bfglite1.png \
-	decals/bfglite2.png \
-	decals/bfgscrc1.png \
-	decals/bfgscrc2.png \
-	decals/plasma1.png \
-	decals/plasma2.png \
-	decals/scorch1.png \
-	decals/bsplat1.png \
-	decals/bsplat2.png \
-	decals/bsplat3.png \
-	decals/bsplat4.png \
-	decals/bsplat5.png \
-	decals/bsplat6.png \
-	decals/bsplat7.png \
-	decals/bsmear1.png \
-	decals/bsmear2.png \
-	decals/chip1.png \
-	decals/chip2.png \
-	decals/chip3.png \
-	decals/chip4.png \
-	decals/chip5.png \
-	decals/cbowmark.png \
-	animdefs.txt \
-	terrain.txt \
-	in_epi1.txt \
-	in_epi2.txt \
-	in_epi3.txt \
-	in_htc1.txt \
-	in_htc2.txt \
-	in_htc3.txt \
-	lockdefs.txt \
-	dehsupp.lmp \
-	xlat/doom.x \
-	xlat/heretic.x \
-	xlat/strife.x \
-	animated.lmp \
-	spaldoom.lmp \
-	spalhtic.lmp \
-	languages/english-us.txt \
-	languages/french.txt \
-	languages/italian.txt \
-	x11r6rgb.txt \
-	stkeys6.lmp \
-	stkeys7.lmp \
-	stkeys8.lmp \
-	dbigfont.lmp \
-	sbigfont.lmp \
-	confont.lmp \
-	fonta60.lmp \
-	fonta61.lmp \
-	fonta62.lmp \
-	fonta63.lmp \
-	fonta164.lmp \
-	fonta165.lmp \
-	fonta182.lmp \
-	fonta188.lmp \
-	fonta191.lmp \
-	stcfn223.lmp \
-	stcfn220.lmp \
-	stcfn214.lmp \
-	stcfn197.lmp \
-	stcfn196.lmp \
-	stpbany.lmp \
-	stfbany.lmp \
-	xhairs1.imgz \
-	xhairs2.imgz \
-	xhairs3.imgz \
-	xhairs4.imgz \
-	xhairs5.imgz \
-	xhairs6.imgz \
-	xhairs7.imgz \
-	xhairb1.imgz \
-	xhairb2.png \
-	xhairb3.imgz \
-	xhairb4.imgz \
-	xhairb5.imgz \
-	xhairb6.imgz \
-	xhairb7.imgz \
-	tnt1a0.png \
-	unkna0.png \
-	tlgl.png \
-	tlgl.png \
-	tlgl.png \
-	tlgl.png \
-	tlgl.png \
-	iceca0.png \
-	icecb0.png \
-	icecc0.png \
-	icecd0.png \
-	badpatch.lmp \
-	noflat.png \
-	sndinfo.txt \
-	sndseq.txt \
-	sndeax.txt \
-	icedeath.flac \
-	icebreak.flac \
-	quake.flac \
-	dsempty.lmp \
-	secret.flac \
-	spark1.flac \
-	spark2.flac \
-	spark3.flac \
-	railgunfire.flac \
-	mapinfo/doom1.txt \
-	mapinfo/doom2.txt \
-	mapinfo/plutonia.txt \
-	mapinfo/tnt.txt \
-	mapinfo/heretic.txt \
-	mapinfo/hexen.txt \
-	mapinfo/strife.txt \
-	strfhelp.o
-	..\tools\makewad\makewad zdoom.lst