diff --git a/MacOSX/codecs/fat/libmad.dylib b/MacOSX/codecs/lib/libmad.dylib
similarity index 100%
rename from MacOSX/codecs/fat/libmad.dylib
rename to MacOSX/codecs/lib/libmad.dylib
diff --git a/MacOSX/codecs/fat/libogg.dylib b/MacOSX/codecs/lib/libogg.dylib
similarity index 100%
rename from MacOSX/codecs/fat/libogg.dylib
rename to MacOSX/codecs/lib/libogg.dylib
diff --git a/MacOSX/codecs/fat/libvorbis.dylib b/MacOSX/codecs/lib/libvorbis.dylib
similarity index 100%
rename from MacOSX/codecs/fat/libvorbis.dylib
rename to MacOSX/codecs/lib/libvorbis.dylib
diff --git a/MacOSX/codecs/fat/libvorbisfile.dylib b/MacOSX/codecs/lib/libvorbisfile.dylib
similarity index 100%
rename from MacOSX/codecs/fat/libvorbisfile.dylib
rename to MacOSX/codecs/lib/libvorbisfile.dylib
diff --git a/MacOSX/codecs/ppc/libmad.a b/MacOSX/codecs/ppc/libmad.a
deleted file mode 100644
index 18d32931..00000000
Binary files a/MacOSX/codecs/ppc/libmad.a and /dev/null differ
diff --git a/MacOSX/codecs/ppc/libogg.a b/MacOSX/codecs/ppc/libogg.a
deleted file mode 100644
index 96a1cfe0..00000000
Binary files a/MacOSX/codecs/ppc/libogg.a and /dev/null differ
diff --git a/MacOSX/codecs/ppc/libvorbis.a b/MacOSX/codecs/ppc/libvorbis.a
deleted file mode 100644
index d486c4cc..00000000
Binary files a/MacOSX/codecs/ppc/libvorbis.a and /dev/null differ
diff --git a/MacOSX/codecs/ppc/libvorbisfile.a b/MacOSX/codecs/ppc/libvorbisfile.a
deleted file mode 100644
index f662eb0e..00000000
Binary files a/MacOSX/codecs/ppc/libvorbisfile.a and /dev/null differ
diff --git a/MacOSX/codecs/x86/libmad.a b/MacOSX/codecs/x86/libmad.a
deleted file mode 100644
index 819ec801..00000000
Binary files a/MacOSX/codecs/x86/libmad.a and /dev/null differ
diff --git a/MacOSX/codecs/x86/libogg.a b/MacOSX/codecs/x86/libogg.a
deleted file mode 100644
index 2748ff51..00000000
Binary files a/MacOSX/codecs/x86/libogg.a and /dev/null differ
diff --git a/MacOSX/codecs/x86/libvorbis.a b/MacOSX/codecs/x86/libvorbis.a
deleted file mode 100644
index 5dbe7cf6..00000000
Binary files a/MacOSX/codecs/x86/libvorbis.a and /dev/null differ
diff --git a/MacOSX/codecs/x86/libvorbisfile.a b/MacOSX/codecs/x86/libvorbisfile.a
deleted file mode 100644
index da97e89f..00000000
Binary files a/MacOSX/codecs/x86/libvorbisfile.a and /dev/null differ
diff --git a/MacOSX/codecs/x86_64/libmad.a b/MacOSX/codecs/x86_64/libmad.a
deleted file mode 100644
index 838ed0b6..00000000
Binary files a/MacOSX/codecs/x86_64/libmad.a and /dev/null differ
diff --git a/MacOSX/codecs/x86_64/libogg.a b/MacOSX/codecs/x86_64/libogg.a
deleted file mode 100644
index 010b7f97..00000000
Binary files a/MacOSX/codecs/x86_64/libogg.a and /dev/null differ
diff --git a/MacOSX/codecs/x86_64/libvorbis.a b/MacOSX/codecs/x86_64/libvorbis.a
deleted file mode 100644
index d8ea2500..00000000
Binary files a/MacOSX/codecs/x86_64/libvorbis.a and /dev/null differ
diff --git a/MacOSX/codecs/x86_64/libvorbisfile.a b/MacOSX/codecs/x86_64/libvorbisfile.a
deleted file mode 100644
index bfeacde8..00000000
Binary files a/MacOSX/codecs/x86_64/libvorbisfile.a and /dev/null differ
diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin
index 2da77dc2..ce8ed196 100644
--- a/Quake/Makefile.darwin
+++ b/Quake/Makefile.darwin
@@ -1,4 +1,4 @@
-# GNU Makefile for QuakeSpasm for Darwin, May 30, 2012
+# GNU Makefile for QuakeSpasm for Mac OS X, Sep. 03, 2012.
 # Usage: "make -f Makefile.darwin"
 # You need the SDL library fully installed.
 # "make DEBUG=1" to build a debug client.
@@ -118,8 +118,6 @@ cpp_vorbisdec=-DVORBIS_USE_TREMOR
 lib_vorbisdec=-lvorbisidec -logg
 endif
 
-#codeclibdir=$(MACH_TYPE)
-codeclibdir=fat
 CODECLIBS  :=
 ifeq ($(USE_CODEC_WAVE),1)
 CFLAGS+= -DUSE_CODEC_WAVE
@@ -127,13 +125,13 @@ endif
 ifeq ($(USE_CODEC_VORBIS),1)
 CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)
 CODEC_INC = -I../MacOSX/codecs/include
-CODEC_LINK= -L../MacOSX/codecs/$(codeclibdir)
+CODEC_LINK= -L../MacOSX/codecs/lib
 CODECLIBS+= $(lib_vorbisdec)
 endif
 ifeq ($(USE_CODEC_MP3),1)
 CFLAGS+= -DUSE_CODEC_MP3
 CODEC_INC = -I../MacOSX/codecs/include
-CODEC_LINK= -L../MacOSX/codecs/$(codeclibdir)
+CODEC_LINK= -L../MacOSX/codecs/lib
 CODECLIBS+= $(lib_mp3dec)
 endif
 CFLAGS+= $(CODEC_INC)