diff --git a/ChangeLog b/ChangeLog
index f0a4b864d..dd3c812d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-18 Riccardo Mottola <rm@gnu.org>
+
+	* Source/NSView.m:
+	Use CGFloat as original structures do and double for scale instead of
+	CGFloat -> double -> float.
+
 2016-07-16 18:12-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSPrintInfo.m: Add a comment so it's clear what
diff --git a/Source/NSView.m b/Source/NSView.m
index 17ab3fdaa..ece89fa20 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -4238,9 +4238,9 @@ static NSView* findByTag(NSView *view, NSInteger aTag, NSUInteger *level)
   NSPrintInfo *info = [printOp printInfo];
   NSGraphicsContext *ctxt = [printOp context];
   NSSize paperSize = [info paperSize];
-  float scale = (double)([self frame].size.width/paperSize.width);
-  float xoff = 0.0;
-  float yoff = (paperSize.height - [self frame].size.height) / scale;
+  double scale = (double)([self frame].size.width/paperSize.width);
+  CGFloat xoff = 0.0;
+  CGFloat yoff = (paperSize.height - [self frame].size.height) / scale;
 
   [ctxt  beginPage: ordinalNum
          label: aString