diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f2159855257..39ed3b3b7e9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,10 @@
-2003-06-20  Doug Gregor <dgregor@apple.com>
+2003-06-23  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* docs/html/17_intro/libstdc++-assign.txt: Update address.
+
+	* testsuite/performance/ifstream_getline.cc: Fix.
+	
+2003-06-23  Doug Gregor <dgregor@apple.com>
 
         * include/bits/boost_concept_check.h: Don't use _D or _R for type 
         names.
diff --git a/libstdc++-v3/docs/html/17_intro/libstdc++-assign.txt b/libstdc++-v3/docs/html/17_intro/libstdc++-assign.txt
index b70be688bca..c9e8ee2b0a2 100644
--- a/libstdc++-v3/docs/html/17_intro/libstdc++-assign.txt
+++ b/libstdc++-v3/docs/html/17_intro/libstdc++-assign.txt
@@ -41,10 +41,10 @@ open Pandora's box and cause a long and unnecessary delay.
 Below is the assignment contract that we usually use.  You need
 to print it out, sign it, and snail it to:
 
-Richard Stallman 
-545 Tech Sq rm 425 
-Cambridge, MA 02139 
-USA 
+Copyright Clerk
+c/o Free Software Foundation 
+59 Temple Place - Suite 330 
+Boston, MA  02111-1307,  USA 
 
 Please try to print the whole first page below on a single piece of
 paper.  If it doesn't fit on one printed page, put it on two sides of
diff --git a/libstdc++-v3/testsuite/performance/ifstream_getline.cc b/libstdc++-v3/testsuite/performance/ifstream_getline.cc
index e7b06f3ec4c..b7ca9976078 100644
--- a/libstdc++-v3/testsuite/performance/ifstream_getline.cc
+++ b/libstdc++-v3/testsuite/performance/ifstream_getline.cc
@@ -37,13 +37,23 @@ int main ()
   time_counter time;
   resource_counter resource;
 
-  const char* name = "/usr/share/dict/linux.words";
+  const char* name1 = "/usr/share/dict/words";
+  const char* name2 = "/usr/share/dict/linux.words";
+  ifstream in;
+  in.open(name1);
+  if (!in.is_open())
+    {
+      in.clear();
+      in.open(name2);
+    }
 
-  ifstream in(name);
   char buffer[BUFSIZ];
   start_counters(time, resource);
-  while(!in.eof()) 
-    in.getline(buffer, BUFSIZ);
+  if (in.is_open())
+    {
+      while (in.good()) 
+	in.getline(buffer, BUFSIZ);
+    }
   stop_counters(time, resource);
   report_performance(__FILE__, "", time, resource);