diff --git a/tools/Forge/Bundles/MapEdit/GNUmakefile b/tools/Forge/Bundles/MapEdit/GNUmakefile
index 5483856ab..294e007e8 100644
--- a/tools/Forge/Bundles/MapEdit/GNUmakefile
+++ b/tools/Forge/Bundles/MapEdit/GNUmakefile
@@ -1,27 +1,62 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 
-BUNDLE_NAME=		MapEdit
-BUNDLE_EXTENSION=	.forgeb
 #
-# We don't install this bundle, it goes inside the app.
+# Subprojects
 #
-BUNDLE_INSTALL_DIR=	none
-MapEdit_STANDARD_INSTALL= no
+SUBPROJECTS=
 
-MapEdit_RESOURCE_FILES= \
-	MapEdit.gorm
+#
+# Main application
+#
+PACKAGE_NAME=		QuakeEd
+APP_NAME=		QuakeEd
+QuakeEd_PRINCIPAL_CLASS=	NSApplication
+QuakeEd_APPLICATION_ICON=	
 
-MapEdit_OBJC_FILES=	\
-	CameraView.m Clipper.m Dict.m DictList.m Entity.m EntityClass.m InspectorControl.m KeypairView.m Map.m PopScrollView.m Preferences.m Project.m QuakeEd.m QuakeEd_main.m SetBrush.m Storage.m TexturePalette.m TextureView.m Things.m XYView.m ZScrollView.m ZView.m render.m
+#
+# Additional libraries
+#
+ADDITIONAL_GUI_LIBS += 
 
-MapEdit_HEADERS= \
-	EntityClass.h
+#
+# Resource files
+#
+QuakeEd_MAIN_MODEL_FILE=	MapEdit.gorm
+QuakeEd_RESOURCE_FILES= MapEdit.gorm
 
-MapEdit_PRINCIPAL_CLASS= \
-	MapEdit
+QuakeEd_LOCALIZED_RESOURCE_FILES=
+
+# Languages we're localized for
+QuakeEd_LANGUAGES= \
+	English
+
+#
+# Header files
+#
+QuakeEd_HEADERS= \
+	CameraView.h Clipper.h Dict.h DictList.h Entity.h EntityClass.h \
+	InspectorControl.h KeypairView.h Map.h PopScrollView.h Preferences.h \
+	Project.h QuakeEd.h SetBrush.h Storage.h TexturePalette.h TextureView.h \
+	Things.h XYView.h ZScrollView.h ZView.h render.h
+
+#
+# Class files
+#
+QuakeEd_OBJC_FILES= \
+	CameraView.m Clipper.m Dict.m DictList.m Entity.m EntityClass.m \
+	InspectorControl.m KeypairView.m Map.m PopScrollView.m Preferences.m \
+	Project.m QuakeEd.m QuakeEd_main.m SetBrush.m Storage.m TexturePalette.m \
+	TextureView.m Things.m XYView.m ZScrollView.m ZView.m render.m
+
+#
+# C files
+#
+QuakeEd_C_FILES=
 
 -include GNUmakefile.preamble
+-include GNUmakefile.local
 
-include $(GNUSTEP_MAKEFILES)/bundle.make
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+include $(GNUSTEP_MAKEFILES)/application.make
 
 -include GNUmakefile.postamble
diff --git a/tools/Forge/Bundles/MapEdit/GNUmakefile.bundle b/tools/Forge/Bundles/MapEdit/GNUmakefile.bundle
new file mode 100644
index 000000000..5483856ab
--- /dev/null
+++ b/tools/Forge/Bundles/MapEdit/GNUmakefile.bundle
@@ -0,0 +1,27 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+BUNDLE_NAME=		MapEdit
+BUNDLE_EXTENSION=	.forgeb
+#
+# We don't install this bundle, it goes inside the app.
+#
+BUNDLE_INSTALL_DIR=	none
+MapEdit_STANDARD_INSTALL= no
+
+MapEdit_RESOURCE_FILES= \
+	MapEdit.gorm
+
+MapEdit_OBJC_FILES=	\
+	CameraView.m Clipper.m Dict.m DictList.m Entity.m EntityClass.m InspectorControl.m KeypairView.m Map.m PopScrollView.m Preferences.m Project.m QuakeEd.m QuakeEd_main.m SetBrush.m Storage.m TexturePalette.m TextureView.m Things.m XYView.m ZScrollView.m ZView.m render.m
+
+MapEdit_HEADERS= \
+	EntityClass.h
+
+MapEdit_PRINCIPAL_CLASS= \
+	MapEdit
+
+-include GNUmakefile.preamble
+
+include $(GNUSTEP_MAKEFILES)/bundle.make
+
+-include GNUmakefile.postamble
diff --git a/tools/Forge/Bundles/MapEdit/GNUmakefile.preamble b/tools/Forge/Bundles/MapEdit/GNUmakefile.preamble
index 92931a8f0..bc060b6b5 100644
--- a/tools/Forge/Bundles/MapEdit/GNUmakefile.preamble
+++ b/tools/Forge/Bundles/MapEdit/GNUmakefile.preamble
@@ -11,7 +11,7 @@ ADDITIONAL_CFLAGS += -Wall -Werror
 ADDITIONAL_INCLUDE_DIRS += -I ../.. -I ../../../../include
 
 # Additional LDFLAGS to pass to the linker
-ADDITIONAL_LDFLAGS += 
+ADDITIONAL_LDFLAGS += -lQFutil
 
 # Additional library directories the linker should search
 ADDITIONAL_LIB_DIRS +=