diff --git a/PCLib/GNUmakefile b/PCLib/GNUmakefile
index cb6c11a..2d65674 100644
--- a/PCLib/GNUmakefile
+++ b/PCLib/GNUmakefile
@@ -69,7 +69,8 @@ PCProjectEditor.h \
 ProjectComponent.h \
 PCProject+ComponentHandling.h \
 PCEditorView+Highlighting.h \
-PCHistoryController.h 
+PCHistoryController.h \
+PCMakefileFactory.h 
 
 #
 
@@ -94,7 +95,8 @@ PCTextFinder.m \
 PCProjectEditor.m \
 PCProject+ComponentHandling.m \
 PCEditorView+Highlighting.m \
-PCHistoryController.m 
+PCHistoryController.m \
+PCMakefileFactory.m 
 
 #
 
diff --git a/PCLib/PCMakefileFactory.h b/PCLib/PCMakefileFactory.h
new file mode 100644
index 0000000..88bf252
--- /dev/null
+++ b/PCLib/PCMakefileFactory.h
@@ -0,0 +1,54 @@
+/* 
+ * PCMakefileFactory.h created by probert on 2002-02-28 22:16:26 +0000
+ *
+ * Project ProjectCenter
+ *
+ * Created with ProjectCenter - http://www.gnustep.org
+ *
+ * $Id$
+ */
+
+#ifndef _PCMAKEFILEFACTORY_H_
+#define _PCMAKEFILEFACTORY_H_
+
+#import <Foundation/Foundation.h>
+
+@interface PCMakefileFactory : NSObject
+{
+    NSMutableString *mfile;
+    NSString        *pnme;
+}
+
++ (PCMakefileFactory *)sharedFactory;
+
+- (void)createMakefileForProject:(NSString *)prName;
+
+- (void)appendString:(NSString *)aString;
+
+- (void)appendApplication;
+
+- (void)appendHeaders:(NSArray *)array;
+- (void)appendClasses:(NSArray *)array;
+- (void)appendCFiles:(NSArray *)array;
+
+- (void)appendResources;
+- (void)appendResourceItems:(NSArray *)array;
+
+- (void)appendInstallDir:(NSString*)dir;
+- (void)appendAppIcon:(NSString*)icn;
+
+- (void)appendSubprojects:(NSArray*)array;
+- (void)appendGuiLibraries:(NSArray*)array;
+
+- (void)appendTailForApp;
+- (void)appendTailForLibrary;
+- (void)appendTailForTool;
+- (void)appendTailForBundle;
+- (void)appendTailForGormApp;
+
+- (NSData *)encodedMakefile;
+
+@end
+
+#endif // _PCMAKEFILEFACTORY_H_
+
diff --git a/PCLib/PCMakefileFactory.m b/PCLib/PCMakefileFactory.m
new file mode 100644
index 0000000..13b0029
--- /dev/null
+++ b/PCLib/PCMakefileFactory.m
@@ -0,0 +1,230 @@
+/* 
+ * PCMakefileFactory.m created by probert on 2002-02-28 22:16:25 +0000
+ *
+ * Project ProjectCenter
+ *
+ * Created with ProjectCenter - http://www.gnustep.org
+ *
+ * $Id$
+ */
+
+#import "PCMakefileFactory.h"
+
+#define COMMENT_HEADERS     @"\n\n#\n# Header files\n#\n\n"
+#define COMMENT_RESOURCES   @"\n\n#\n# Resource files\n#\n\n"
+#define COMMENT_CLASSES     @"\n\n#\n# Class files\n#\n\n"
+#define COMMENT_CFILES      @"\n\n#\n# C files\n#\n\n"
+#define COMMENT_SUBPROJECTS @"\n\n#\n# Subprojects\n#\n\n"
+#define COMMENT_APP         @"\n\n#\n# Main application\n#\n\n"
+#define COMMENT_LIBRARIES   @"\n\n#\n# Additional libraries\n#\n\n"
+
+@implementation PCMakefileFactory
+
+static PCMakefileFactory *_factory = nil;
+
++ (PCMakefileFactory *)sharedFactory
+{
+    static BOOL isInitialised = NO;
+
+    if( isInitialised == NO )
+    {
+        _factory = [[PCMakefileFactory alloc] init];
+
+        isInitialised = YES;
+    }
+
+    return _factory;
+}
+
+- (void)createMakefileForProject:(NSString *)prName
+{
+    NSAssert( prName, @"No project name given!");
+
+    AUTORELEASE( mfile );
+    mfile = [[NSMutableString alloc] init];
+
+    AUTORELEASE( pnme );
+    pnme = [prName copy];
+
+    [mfile appendString:@"#\n"];
+    [mfile appendString:@"# GNUmakefile - Generated by ProjectCenter\n"];
+    [mfile appendString:@"# Written by Philippe C.D. Robert <phr@3dkit.org>\n"];
+    [mfile appendString:@"#\n"];
+    [mfile appendString:@"# NOTE: Do NOT change this file -- ProjectCenter maintains it!\n"];
+    [mfile appendString:@"#\n"];
+    [mfile appendString:@"# Put all of your customisations in GNUmakefile.preamble and\n"];
+    [mfile appendString:@"# GNUmakefile.postamble\n"];
+    [mfile appendString:@"#\n\n"];
+}
+
+- (void)appendString:(NSString *)aString
+{
+    NSAssert( mfile, @"No valid makefile available!");
+    NSAssert( aString, @"No valid string!");
+
+    [mfile appendString:aString];
+}
+
+- (void)appendApplication
+{
+    [self appendString:COMMENT_APP];
+
+    [self appendString:[NSString stringWithFormat:@"PACKAGE_NAME=%@\n",pnme]];
+    [self appendString:[NSString stringWithFormat:@"APP_NAME=%@\n",pnme]];
+}
+
+- (void)appendHeaders:(NSArray *)array
+{
+    [self appendString:COMMENT_HEADERS];
+    [self appendString:[NSString stringWithFormat:@"%@_HEADERS= ",pnme]];
+
+    if( array && [array count] )
+    {
+        NSString     *tmp;
+        NSEnumerator *enumerator = [array objectEnumerator];
+
+	while (tmp = [enumerator nextObject]) 
+        {
+	    [self appendString:[NSString stringWithFormat:@"\\\n%@ ",tmp]];
+	}
+    }
+}
+
+- (void)appendClasses:(NSArray *)array
+{
+    [self appendString:COMMENT_CLASSES];
+    [self appendString:[NSString stringWithFormat:@"%@_OBJC_FILES= ",pnme]];
+
+    if( array && [array count] )
+    {
+        NSString     *tmp;
+        NSEnumerator *enumerator = [array objectEnumerator];
+
+	while (tmp = [enumerator nextObject]) 
+        {
+	    [self appendString:[NSString stringWithFormat:@"\\\n%@ ",tmp]];
+	}
+    }
+}
+
+- (void)appendCFiles:(NSArray *)array
+{
+    [self appendString:COMMENT_CFILES];
+    [self appendString:[NSString stringWithFormat:@"%@_C_FILES= ",pnme]];
+
+    if( array && [array count] )
+    {
+        NSString     *tmp;
+        NSEnumerator *enumerator = [array objectEnumerator];
+
+	while (tmp = [enumerator nextObject]) 
+        {
+	    [self appendString:[NSString stringWithFormat:@"\\\n%@ ",tmp]];
+	}
+    }
+}
+
+- (void)appendResources
+{
+    [self appendString:COMMENT_RESOURCES];
+    [self appendString:[NSString stringWithFormat:@"%@_RESOURCE_FILES= ",pnme]];
+}
+
+- (void)appendResourceItems:(NSArray *)array
+{
+    NSString     *tmp;
+    NSEnumerator *enumerator = [array objectEnumerator];
+
+    while (tmp = [enumerator nextObject]) {
+	[self appendString:[NSString stringWithFormat:@"\\\n%@ ",tmp]];
+    }
+}
+
+- (void)appendInstallDir:(NSString*)dir
+{
+    [self appendString:
+             [NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR=%@\n",dir]];
+}
+
+- (void)appendAppIcon:(NSString*)icn
+{
+    [self appendString:
+             [NSString stringWithFormat:@"%@_APPLICATION_ICON=%@\n",pnme, icn]];
+}
+
+- (void)appendSubprojects:(NSArray*)array
+{
+    [self appendString:COMMENT_SUBPROJECTS];
+
+    if (array && [array count]) 
+    {
+	NSString     *tmp;
+        NSEnumerator *enumerator = [array objectEnumerator];
+
+        while (tmp = [enumerator nextObject]) {
+            [self appendString:[NSString stringWithFormat:@"\\\n%@ ",tmp]];
+        }
+    }
+
+}
+
+- (void)appendGuiLibraries:(NSArray*)array
+{
+    [self appendString:COMMENT_LIBRARIES];
+    [self appendString:@"ADDITIONAL_GUI_LIBS += "];
+
+    if( array && [array count] )
+    {
+        NSString     *tmp;
+        NSEnumerator *enumerator = [array objectEnumerator];
+
+        while (tmp = [enumerator nextObject]) 
+        {
+          if (![tmp isEqualToString:@"gnustep-base"] &&
+              ![tmp isEqualToString:@"gnustep-gui"]) 
+          {
+            [self appendString:[NSString stringWithFormat:@"-l%@ ",tmp]];
+          }
+        }
+    }
+}
+
+- (void)appendTailForApp
+{
+    [self appendString:@"\n\n"];
+
+    [self appendString:@"-include GNUmakefile.preamble\n"];
+    [self appendString:@"-include GNUmakefile.local\n"];
+    [self appendString:@"include $(GNUSTEP_MAKEFILES)/aggregate.make\n"];
+    [self appendString:@"include $(GNUSTEP_MAKEFILES)/application.make\n"];
+    [self appendString:@"-include GNUmakefile.postamble\n"];
+}
+
+- (void)appendTailForLibrary
+{
+    [self appendString:@""];
+}
+
+- (void)appendTailForTool
+{
+    [self appendString:@""];
+}
+
+- (void)appendTailForBundle
+{
+    [self appendString:@""];
+}
+
+- (void)appendTailForGormApp
+{
+    [self appendString:@""];
+}
+
+- (NSData *)encodedMakefile
+{
+    NSAssert( mfile, @"No valid makefile available!");
+
+    return [mfile dataUsingEncoding:[NSString defaultCStringEncoding]];
+}
+
+@end
diff --git a/PCLib/ProjectCenter.h b/PCLib/ProjectCenter.h
index a81bce7..2ba8744 100644
--- a/PCLib/ProjectCenter.h
+++ b/PCLib/ProjectCenter.h
@@ -53,6 +53,7 @@
 #import <ProjectCenter/PCEditorView.h>
 #import <ProjectCenter/PCEditorView+Highlighting.h>
 #import <ProjectCenter/PCTextFinder.h>
+#import <ProjectCenter/PCMakefileFactory.h>
 
 #endif
 
diff --git a/PCLib/ProjectCenter.pcproj b/PCLib/ProjectCenter.pcproj
index fb18e8d..b77002c 100644
--- a/PCLib/ProjectCenter.pcproj
+++ b/PCLib/ProjectCenter.pcproj
@@ -19,7 +19,8 @@
 	PCProjectEditor.m,
 	PCProject+ComponentHandling.m,
 	PCEditorView+Highlighting.m,
-	PCHistoryController.m
+	PCHistoryController.m,
+	PCMakefileFactory.m
     );
     COMPILEROPTIONS = "";
     CREATION_DATE = "";
@@ -56,7 +57,8 @@
 	ProjectComponent.h,
 	PCProject+ComponentHandling.h,
 	PCEditorView+Highlighting.h,
-	PCHistoryController.h
+	PCHistoryController.h,
+	PCMakefileFactory.h
     );
     INSTALLDIR = "$(GNUSTEP_SYSTEM_ROOT)";
     LANGUAGE = English;