diff --git a/ChangeLog b/ChangeLog
index 289b51519..9a31a3539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-16  Niels Grewe <niels.grewe@halbordnung.de>
+
+	* Source/NSScanner.m: Implement -scanInteger: by conditionally
+	calling -scanInt: or -scanLongLong: based on the pointer size
+	detected at configure time.
+
 2014-01-16  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSKeyValueObserving.m:
diff --git a/Source/NSScanner.m b/Source/NSScanner.m
index 72f4bf578..8edcd7754 100644
--- a/Source/NSScanner.m
+++ b/Source/NSScanner.m
@@ -1146,7 +1146,11 @@ typedef GSString	*ivars;
 }
 - (BOOL) scanInteger: (NSInteger *)value
 {
-  return NO;    // FIXME
+#if GS_SIZEOF_VOIDP < 8
+  return [self scanInt: value];
+#else
+  return [self scanLongLong: value];
+#endif
 }
 @end