diff --git a/tools/Forge/.gitignore b/tools/Forge/.gitignore
index 078a6d52f..5d029c8b1 100644
--- a/tools/Forge/.gitignore
+++ b/tools/Forge/.gitignore
@@ -1,17 +1,12 @@
 .vimrc
 ChangeLog
+Config.h*
 Forge.app
 Forge.debug
 Forge.profile
-GNUmakefile.preamble
 aclocal.m4
-build-stamp
 config.cache
 config.log
 config.status
 configure
-configure-stamp
-shared_debug_obj
-shared_obj
-shared_profile_debug_obj
-shared_profile_obj
+*_obj
diff --git a/tools/Forge/BundleController.m b/tools/Forge/BundleController.m
index 760a28835..43ba8d774 100644
--- a/tools/Forge/BundleController.m
+++ b/tools/Forge/BundleController.m
@@ -37,6 +37,8 @@ static const char rcsid[] =
 #import <Foundation/NSDebug.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSPathUtilities.h>
+#import <AppKit/NSPanel.h>
+
 #import "BundleController.h"
 
 @interface BundleController (Private)
@@ -84,10 +86,10 @@ static const char rcsid[] =
 
 	// ensure path exists, and is a directory
 	if (![fm fileExistsAtPath: path isDirectory: &isDir])
-		return;
+		return nil;
 
 	if (!isDir)
-		return;
+		return nil;
 
 	// scan for bundles matching the extension in the dir
 	enumerator = [[fm directoryContentsAtPath: path] objectEnumerator];
@@ -95,6 +97,7 @@ static const char rcsid[] =
 		if ([[dir pathExtension] isEqualToString: extension])
 			[bundleList addObject: dir];
 	}
+	return bundleList;
 }
 
 @end
diff --git a/tools/Forge/Controller.m b/tools/Forge/Controller.m
index 9a0c116c2..5cf7a84d0 100644
--- a/tools/Forge/Controller.m
+++ b/tools/Forge/Controller.m
@@ -41,8 +41,6 @@ static const char rcsid[] =
 
 @implementation Controller
 
-static PrefsController	*prefsController = nil;
-
 - (BOOL) application: (NSApplication *) app openFile: (NSString *) filename;
 {
 	return NO;
@@ -137,8 +135,8 @@ static PrefsController	*prefsController = nil;
 	NSMenu	*project;
 	NSMenu	*file;
 	NSMenu	*edit;
-	NSMenu	*bsp;
-	NSMenu	*brush;
+//	NSMenu	*bsp;
+//	NSMenu	*brush;
 	NSMenu	*windows;
 	NSMenu	*services;
 
diff --git a/tools/Forge/GNUmakefile b/tools/Forge/GNUmakefile
index 34303f7bf..830871865 100644
--- a/tools/Forge/GNUmakefile
+++ b/tools/Forge/GNUmakefile
@@ -3,7 +3,7 @@
 #
 #	Main makefile for the Forge Quake Editor
 #
-#	Copyright (C) 2001 Jeff Teunissen <deek@dusknet.dhs.org>
+#	Copyright (C) 2001 Jeff Teunissen <deek@d2dc.net>
 #
 #	This Makefile is free software; you can redistribute it and/or
 #	modify it under the terms of the GNU General Public License
@@ -67,6 +67,7 @@ Forge_LANGUAGES= \
 # Header files
 #
 Forge_HEADERS= \
+	Config.h \
 	BundleController.h \
 	Controller.h \
 	Preferences.h \
diff --git a/tools/Forge/GNUmakefile.preamble.in b/tools/Forge/GNUmakefile.preamble
similarity index 72%
rename from tools/Forge/GNUmakefile.preamble.in
rename to tools/Forge/GNUmakefile.preamble
index e81ac6490..a2a107924 100644
--- a/tools/Forge/GNUmakefile.preamble.in
+++ b/tools/Forge/GNUmakefile.preamble
@@ -1,14 +1,14 @@
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS += 
+ADDITIONAL_CPPFLAGS +=
 
 # Additional flags to pass to the Objective-C compiler
-ADDITIONAL_OBJCFLAGS += -g @CFLAGS@
+ADDITIONAL_OBJCFLAGS += -Wall -Werror
 
 # Additional flags to pass to the C compiler
-ADDITIONAL_CFLAGS += -g @CFLAGS@
+ADDITIONAL_CFLAGS += -Wall -Werror
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I ./Headers
+ADDITIONAL_INCLUDE_DIRS +=
 
 # Additional LDFLAGS to pass to the linker
 ADDITIONAL_LDFLAGS += 
@@ -36,4 +36,7 @@ ADDITIONAL_WO_LIBS +=
 #
 
 # Additional directories to be created during installation
-ADDITIONAL_INSTALL_DIRS +=
+ADDITIONAL_INSTALL_DIRS += \
+	$(GNUSTEP_LOCAL_DIR)/Library/Forge \
+	$(GNUSTEP_NETWORK_DIR)/Library/Forge \
+	$(GNUSTEP_SYSTEM_DIR)/Library/Forge
diff --git a/tools/Forge/acconfig.h b/tools/Forge/acconfig.h
deleted file mode 100644
index 1a189ff2e..000000000
--- a/tools/Forge/acconfig.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Headers/Config.h.  Generated automatically by configure.  */
-/* Headers/Config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
diff --git a/tools/Forge/bootstrap b/tools/Forge/bootstrap
deleted file mode 100755
index 6a1488be8..000000000
--- a/tools/Forge/bootstrap
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-aclocal && autoheader && autoconf
diff --git a/tools/Forge/configure.in b/tools/Forge/configure.in
deleted file mode 100644
index 2c84b807d..000000000
--- a/tools/Forge/configure.in
+++ /dev/null
@@ -1,58 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.13)
-AC_INIT(Forge_main.m)
-AC_CONFIG_HEADER(Headers/Config.h)
-AC_REVISION($Revision$) dnl
-AC_CANONICAL_SYSTEM
-
-AC_DEFINE(PACKAGE, "Forge")
-AC_DEFINE(VERSION, "0.1.0")
-
-AC_SUBST(VERSION)
-
-ISODATE=$(date +%Y-%m-%d)
-AC_SUBST(ISODATE)
-
-dnl Checks for programs.
-AC_PROG_INSTALL
-AC_PROG_CC
-AC_PROG_CPP
-
-AC_LANG_C
-
-dnl We want warnings, lots of warnings...
-if test "x$GCC" = xyes; then
-	CFLAGS="$CFLAGS -Wall -Werror -Wno-comment"
-#	CFLAGS="$CFLAGS -Wall -pedantic"
-fi
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for library functions.
-
-AC_CHECK_HEADER(QF/qtypes.h, HAVE_QF=yes, HAVE_QF=no)
-if test "$HAVE_QF" = yes; then
-	AC_CHECK_LIB(QFutil, Qopen,
-	    HAVE_QF=yes, HAVE_QF=no,
-	    []
-	)
-fi
-
-if test "$HAVE_QF" != yes; then
-	echo '***'
-	echo '*** You seem to not have the QuakeForge libs & headers installed'
-	echo '***'
-	exit 1
-fi
-
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-
-AC_OUTPUT(
-	GNUmakefile.preamble
-)