diff --git a/apple/GtkRadiant.app/Contents/MacOS/radiant b/apple/GtkRadiant.app/Contents/MacOS/radiant
index 40af99ff..8d06d233 100755
--- a/apple/GtkRadiant.app/Contents/MacOS/radiant
+++ b/apple/GtkRadiant.app/Contents/MacOS/radiant
@@ -21,6 +21,6 @@ export PANGO_SYSCONFDIR="${resources}/etc"
 export PANGO_LIBDIR="${resources}/lib"
 
 cd "${resources}/install"
-./radiant.bin $@
+./radiant.bin
 
 set +x
\ No newline at end of file
diff --git a/apple/GtkRadiant.app/Contents/Resources/etc/gtk-2.0/gtk.immodules b/apple/GtkRadiant.app/Contents/Resources/etc/gtk-2.0/gtk.immodules
deleted file mode 100644
index e69de29b..00000000
diff --git a/apple/Makefile b/apple/Makefile
index e13f8824..6aec233c 100644
--- a/apple/Makefile
+++ b/apple/Makefile
@@ -1,4 +1,4 @@
-# Makefile for GtkRadiant, requires http://macdylibbundler.sourceforge.net/
+# Makefile for GtkRadiant.app, requires http://macdylibbundler.sourceforge.net/
 
 INSTALL = ../install
 TARGET = target
@@ -12,7 +12,7 @@ VERSION = 1.6.4
 DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg
 VOLUME_NAME = "GtkRadiant $(VERSION)"
 
-all: install
+all: install gtk-runtime bundle
 
 pre-install:
 	install -d $(TARGET)
@@ -22,21 +22,32 @@ pre-install:
 install: pre-install
 	cp -r $(INSTALL) $(RESOURCES)
 	rm -rf `find $(INSTDIR)/installs -type d -name .svn`
-	
+
 gtk-runtime:
 	gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \
 		$(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders
 		
+	gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \
+		$(CONFDIR)/gtk-2.0/gtk.immodules
+		
 	pango-querymodules | sed $(PREFIX_SED_EXPR) > \
 		$(CONFDIR)/pango/pango.modules
 	
 	cp -r /opt/local/lib/gdk-pixbuf-2.0 $(LIBDIR)
+	cp -r /opt/local/lib/gtk-2.0 $(LIBDIR)
 	cp -r /opt/local/lib/pango $(LIBDIR)
 	
-	find $(LIBDIR) -type f ! -name "*.so" -delete
+	find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete
+	find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete	
+	find $(LIBDIR)/pango -type f ! -name "*.so" -delete
+	
+	rm -rf $(LIBDIR)/gtk-2.0/{includes,modules}
+	rm -rf $(LIBDIR)/gtk-2.0/*/printbackends
 	
 	dylibbundler -b \
-		`find $(LIBDIR) -type f | xargs -I {} echo -x {}` \
+		`find $(LIBDIR)/gdk-pixbuf-2.0 -type f | xargs -I {} echo -x {}` \
+		`find $(LIBDIR)/gtk-2.0 -type f | xargs -I {} echo -x {}` \
+		`find $(LIBDIR)/pango -type f | xargs -I {} echo -x {}` \
 	-d $(LIBDIR) -of -p @executable_path/../lib
 	
 	cp -r /opt/local/share/themes/Default $(RESOURCES)/share
diff --git a/config.py b/config.py
index 1708b54a..d43e6420 100644
--- a/config.py
+++ b/config.py
@@ -248,7 +248,7 @@ class Config:
             env.Append( LINKFLAGS = '-Wl,-rpath,.' )
                 
         # On Mac, we pad headers so that we may rewrite them for packaging
-        if ( self.platform == 'Darwin') :
+        if ( self.platform == 'Darwin' ) :
             env.Append( LINKFLAGS = [ '-headerpad_max_install_names' ] )
 
     def CheckoutOrUpdate( self, svnurl, path ):