diff --git a/FLAC/Makefile.mgw b/FLAC/Makefile.mgw
index f910c5804..8021789b1 100644
--- a/FLAC/Makefile.mgw
+++ b/FLAC/Makefile.mgw
@@ -36,7 +36,7 @@ AR = ar
 ARFLAGS = rcs
 
 OBJS = cpu_asm.o fixed_asm.o lpc_asm.o \
-       bitmath.o bitreader.o cpu.o crc.o fixed.o format.o lpc.o md5.c memory.o stream_decoder.o stream_decoder_pp.o
+       bitmath.o bitreader.o cpu.o crc.o fixed.o format.o lpc.o md5.o memory.o stream_decoder.o stream_decoder_pp.o
 
 all: $(STATICLIB)
 
diff --git a/Makefile.linux b/Makefile.linux
index 50d64a2a7..1bbaf12ca 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -14,7 +14,7 @@ ifdef GC
   CFLAGS += -ffunction-sections
   LDFLAGS += -Wl,--gc-sections
 endif
-CFLAGS += -MMD -DHAVE_FILELENGTH -D__forceinline=inline -Izlib `sdl-config --cflags` `pkg-config gtk+-2.0 --cflags`
+CFLAGS += -MMD -DHAVE_FILELENGTH -D__forceinline=inline `sdl-config --cflags` `pkg-config gtk+-2.0 --cflags`
 CFLAGS += -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNEED_STRUPR
 LDFLAGS += -lFLAC++ -lFLAC -lz -ljpeg -lfmod `sdl-config --libs` `pkg-config gtk+-2.0 --libs`
 NASMFLAGS += -f elf -DM_TARGET_LINUX
diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 7927dc66f..d3674bbd2 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,8 @@
+December 6, 2007
+- Fixed: The FLAC/makefile.mgw should use md5.o as an OBJ, not md5.c.
+- Fixed: The Linux makefile probably shouldn't be using the bundled zlib headers,
+  either.
+
 December 6, 2007 (Changes by Graf Zahl)
 - Added Karate Chris's submission for scoreboard enhancement.
 - Fixed: A_PainDie and A_DualPainAttack could fail to spawn the correct actor