diff --git a/ChangeLog b/ChangeLog
index 60d60c12b..235291c06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-09  Adam Fedor  <fedor@gnu.org>
+
+	* Source/o_vscanf.c (o_vscanf): Don't count '\n' as whitespace.
+
 Sun Nov  7 14:04:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/Foundation/NSDebug.h: Added NSWarnLog(), NSWarnFLog() and
diff --git a/Source/o_vscanf.c b/Source/o_vscanf.c
index 0c8943c7f..79f90299d 100644
--- a/Source/o_vscanf.c
+++ b/Source/o_vscanf.c
@@ -181,10 +181,12 @@ o_vscanf (void *stream,
 	  if (isspace(fc))
 	    {
 	      /* Whitespace characters match any amount of whitespace.  */
-	      while (isspace (c))
+	      while (isspace (c) && c != '\n')
 		inchar ();
 	      continue;
 	    }
+          else if (c == fc && *f == '\0')
+            continue;
 	  else if (c == fc)
 	    (void) inchar();
 	  else
diff --git a/Testing/GNUmakefile b/Testing/GNUmakefile
index f53518b88..dd589c5d0 100644
--- a/Testing/GNUmakefile
+++ b/Testing/GNUmakefile
@@ -85,6 +85,7 @@ create-abbrevs \
 create-regions
 
 # The tool Objective-C source files to be compiled
+testtool_OBJC_FILES = testtool.m
 benchmark_OBJC_FILES = benchmark.m
 containers_OBJC_FILES = containers.m
 test01_OBJC_FILES = test01.m