diff --git a/ChangeLog b/ChangeLog
index b7f0aa14c..f6cc5d497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-28 Riccardo Mottola <rm@gnu.org>
+
+	* Headers/AppKit/NSScrollView.h
+	* Source/NSScrollView.m
+	Stub 10.8 methods for allowsMagnification.
+
 2015-10-28 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSPasteboard.m (-_pbs): Fix waiting forever if gpbs
diff --git a/Headers/AppKit/NSScrollView.h b/Headers/AppKit/NSScrollView.h
index 8c0456cac..910fa15de 100644
--- a/Headers/AppKit/NSScrollView.h
+++ b/Headers/AppKit/NSScrollView.h
@@ -159,6 +159,10 @@ typedef NSInteger NSScrollElasticity;
 - (NSScrollElasticity)verticalScrollElasticity;
 - (void)setVerticalScrollElasticity:(NSScrollElasticity)value;
 #endif
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_8, GS_API_LATEST)
+- (BOOL)allowsMagnification;
+- (void)setAllowsMagnification:(BOOL)m;
+#endif
 
 /* Updating display after scrolling */
 - (void)reflectScrolledClipView:(NSClipView*)aClipView;
diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index 0144429f0..b8633cee1 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -1534,6 +1534,17 @@ GSOppositeEdge(NSRectEdge edge)
   return _vertScroller;
 }
 
+- (BOOL)allowsMagnification
+{
+  //we need an ivar for this
+  return NO;
+}
+
+- (void)setAllowsMagnification:(BOOL)m
+{
+  //we need an ivar for this
+}
+
 /*
  * NSCoding protocol
  */