diff --git a/ChangeLog b/ChangeLog
index 1c8ac9b..ec44ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-20 03:45-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Framework/PCMakefileFactory.m: Check if buildDir is nil before 
+	generating the BUILD_DIR directive in the make file.   Sometimes
+	this is coming up with (nil) on Windows which is causing the build
+	phase to fail.
+
 2009-09-19 Riccardo Mottola <rmottola@users.sf.net>
 
 	* Images/Options.tiff
diff --git a/Framework/PCMakefileFactory.m b/Framework/PCMakefileFactory.m
index 6a9719a..10ac653 100644
--- a/Framework/PCMakefileFactory.m
+++ b/Framework/PCMakefileFactory.m
@@ -107,7 +107,7 @@ static PCMakefileFactory *_factory = nil;
   
   [mfile appendString: @"\ninclude $(GNUSTEP_MAKEFILES)/common.make\n"];
 
-  if (![buildDir isEqualToString: @""])
+  if (![buildDir isEqualToString: @""] && buildDir != nil)
     {
       [mfile appendString:
         [NSString stringWithFormat: @"\nGNUSTEP_BUILD_DIR = %@\n",