diff --git a/ChangeLog b/ChangeLog
index 6f6623bcd..ba25398d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17 21:00-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSView.m: Changes to beginPage:... and endPage to correct
+	issues with blank space at the top of the page when printing.
+
 2008-03-16 Riccardo Mottola <rmottola@users.sf.net>
 
 	* Source/NSApplication.m : changed terminate type to BOOL
diff --git a/Source/NSView.m b/Source/NSView.m
index 553c1ec77..dc0ca59ff 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -4112,7 +4112,7 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
       DPSPrintf(ctxt, "__GSpagesaveobject restore\n\n");
     }
 
-  [self unlockFocus];
+  // [self unlockFocus];
 }
 
 - (void) endTrailer
@@ -4218,10 +4218,6 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
   NSGraphicsContext *ctxt = [printOp context];
   NSDictionary *dict = [[printOp printInfo] dictionary];
 
-  // FIXME: Need to place this correctly. Maybe it isn't needed at all, 
-  // as all drawing happens in displayRectIgnoringOpacity:
-  [self lockFocusIfCanDrawInContext: ctxt];
-
   if ([dict objectForKey: @"NSPrintPaperBounds"])
     bounds = [[dict objectForKey: @"NSPrintPaperBounds"] rectValue];
   else
@@ -4251,14 +4247,21 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
         yoff = (int)((nup-page-1) / (nup/2));
       yoff *= NSHeight(bounds) * scale;
       DPStranslate(ctxt, xoff, yoff);
+      DPSgsave(ctxt);
       DPSscale(ctxt, scale, scale);
     }
-
-  DPSgsave(ctxt);
+  else
+    {
+      DPSgsave(ctxt);
+    }
 
   /* Translate to placement */
   if (location.x != 0 || location.y != 0)
     DPStranslate(ctxt, location.x, location.y);
+
+  // FIXME: Need to place this correctly. Maybe it isn't needed at all, 
+  // as all drawing happens in displayRectIgnoringOpacity:
+  // [self lockFocusIfCanDrawInContext: ctxt];
 }
 
 - (void) _endSheet