diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4d244376d97..9e2c2c13761 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-26  Nathan C. Myers  <ncm-nospam@cantrip.org>
+            Paolo Carlini  <pcarlini@unitus.it>
+
+	* testsuite/performance/filebuf_copy.cc: New, testing char
+	by char file copy.
+
 2003-06-26  Paolo Carlini  <pcarlini@unitus.it>
             Nathan C. Myers  <ncm-nospam@cantrip.org>
 
diff --git a/libstdc++-v3/testsuite/performance/filebuf_copy.cc b/libstdc++-v3/testsuite/performance/filebuf_copy.cc
new file mode 100644
index 00000000000..f393b92c0a3
--- /dev/null
+++ b/libstdc++-v3/testsuite/performance/filebuf_copy.cc
@@ -0,0 +1,75 @@
+// Copyright (C) 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#include <cstdio>
+#include <fstream>
+#include <testsuite_performance.h>
+
+int main()
+{
+  using namespace std;
+  using namespace __gnu_cxx_test;
+
+  time_counter time;
+  resource_counter resource;
+  const unsigned long count = 1ul << 30;
+
+  // C unlocked
+  FILE* fpi = fopen("/dev/zero", "r");
+  FILE* fpo = fopen("/dev/null", "w");
+  start_counters(time, resource);
+  for (unsigned long i = 0; i < count; ++i)
+    {
+      int c = getc_unlocked(fpi);
+      if (c == EOF || putc_unlocked(c, fpo) == EOF)
+	break;
+    }
+  stop_counters(time, resource);
+  fclose(fpi);
+  fclose(fpo);
+  report_performance(__FILE__, "C unlocked", time, resource);
+  clear_counters(time, resource);
+
+  // C++
+  filebuf in;
+  in.open("/dev/zero", ios::in);
+  filebuf out;
+  out.open("/dev/null", ios::out);
+  start_counters(time, resource);
+  for (unsigned long i = 0; i < count; ++i)
+    {
+      int c = in.sbumpc();
+      if (c == EOF || out.sputc(c) == EOF)
+	break;
+    }
+  stop_counters(time, resource);
+  in.close();
+  out.close();
+  report_performance(__FILE__, "C++", time, resource);
+
+  return 0;
+}