diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f04ef50830d..c1d2b677ce5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,10 @@
+2002-06-20  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* src/ext-inst.cc (__gnu_cxx): Use instead of std:: for extensions.
+	Use size_type instead of unsigned long.
+
 2002-06-20  Steve Ellcey  <sje@cup.hp.com>
+
 	* src/ext-inst.cc (_S_fetch): Add explicit templates for char and
 	wchar types.
 	(_S_min_len): Ditto.
diff --git a/libstdc++-v3/src/ext-inst.cc b/libstdc++-v3/src/ext-inst.cc
index b7af68242f7..4896b110d42 100644
--- a/libstdc++-v3/src/ext-inst.cc
+++ b/libstdc++-v3/src/ext-inst.cc
@@ -34,34 +34,29 @@
 #include <ext/rope>
 #include <ext/stdio_filebuf.h>
 
-namespace std
+namespace __gnu_cxx
 {
-  using __gnu_cxx::stdio_filebuf;
-
   template
     const unsigned long 
-    __gnu_cxx::rope<char, std::allocator<char> >::_S_min_len;
+    rope<char, std::allocator<char> >::_S_min_len;
 
   template
     char
-    __gnu_cxx::rope<char, std::allocator<char> >::
-    _S_fetch(__gnu_cxx::_Rope_RopeRep<char, std::allocator<char> >*,
-	     unsigned long);
+    rope<char, std::allocator<char> >::
+    _S_fetch(_Rope_RopeRep<char, std::allocator<char> >*, size_type);
 
   template class stdio_filebuf<char>;
 
 #ifdef _GLIBCPP_USE_WCHAR_T
   template
     const unsigned long
-    __gnu_cxx::rope<wchar_t, std::allocator<wchar_t> >::_S_min_len;
+    rope<wchar_t, std::allocator<wchar_t> >::_S_min_len;
 
   template
     wchar_t
-    __gnu_cxx::rope<wchar_t, std::allocator<wchar_t> >::
-    _S_fetch(__gnu_cxx::_Rope_RopeRep<wchar_t, std::allocator<wchar_t> >*,
-	     unsigned long);
+    rope<wchar_t, std::allocator<wchar_t> >::
+    _S_fetch(_Rope_RopeRep<wchar_t, std::allocator<wchar_t> >*, size_type);
 
   template class stdio_filebuf<wchar_t>;
 #endif
-
-} // namespace std
+} // namespace __gnu_cxx