diff --git a/ChangeLog b/ChangeLog
index 4ee430d49..7ef1fc6c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-01  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSPrintInfo.m ([NSPrintInfo -paperSize]): Avoid returning
+	a nil object return value into a struct.
+
+	* Printing/GSLPR/GNUmakefile.preamble: Add 
+	Source/$(GNUSTEP_TARGET_DIR) includes
+	* Tools/GNUmakefile.preamble: Likewise.
+
 2004-09-02 00:17  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/NSView.m (-replaceSubview:with:): Clarify documentation.
diff --git a/Printing/GSLPR/GNUmakefile.preamble b/Printing/GSLPR/GNUmakefile.preamble
index 75cf13a4a..fc400ae04 100644
--- a/Printing/GSLPR/GNUmakefile.preamble
+++ b/Printing/GSLPR/GNUmakefile.preamble
@@ -8,7 +8,8 @@ ADDITIONAL_OBJCFLAGS +=
 ADDITIONAL_CFLAGS +=
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../../Headers/Additions -I../../Headers -I../../Source
+ADDITIONAL_INCLUDE_DIRS += -I../../Headers/Additions -I../../Headers \
+	-I../../Source/$(GNUSTEP_TARGET_DIR)
 
 # Additional LDFLAGS to pass to the linker
 ADDITIONAL_LDFLAGS += 
diff --git a/Source/NSPrintInfo.m b/Source/NSPrintInfo.m
index 3c61b9f62..f06ed9613 100644
--- a/Source/NSPrintInfo.m
+++ b/Source/NSPrintInfo.m
@@ -256,7 +256,12 @@ static NSPrintInfo *sharedPrintInfo = nil;
 
 - (NSSize)paperSize
 {
-  return [(NSValue *)[_info objectForKey:NSPrintPaperSize] sizeValue];
+  /* Don't simplify this. Some OSs can't handle retuning a NULL value into
+     a struct.  */
+  NSValue *val = [_info objectForKey:NSPrintPaperSize];
+  if (val == nil)
+    return NSMakeSize(0,0);
+  return [val sizeValue];
 }
 
 - (float)rightMargin
diff --git a/Tools/GNUmakefile.preamble b/Tools/GNUmakefile.preamble
index 74d99d252..c5836605c 100644
--- a/Tools/GNUmakefile.preamble
+++ b/Tools/GNUmakefile.preamble
@@ -21,7 +21,8 @@
 # ADDITIONAL_CFLAGS += 
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers -I../Source
+ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers \
+	-I../Source/$(GNUSTEP_TARGET_DIR)
 
 # Additional LDFLAGS to pass to the linker
 # ADDITIONAL_LDFLAGS +=