diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f736c640fa8..7a11af91efb 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-12  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/17948
+	* include/bits/stl_tree.h (erase(iterator, iterator)): Revert
+	wrong commit of 2004-10-07.
+	
+2004-10-12  Scott Snyder  <snyder@fnal.gov>
+
+	PR libstdc++/17948
+	* testsuite/23_containers/set/modifiers/17948.cc: New.
+
 2004-10-11  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/stl_deque.h: Correct for over-long lines.
diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index 0b47dd2de73..e2442f09c46 100644
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -1087,8 +1087,8 @@ namespace std
       if (__first == begin() && __last == end())
 	clear();
       else
-	for (; __first != __last; ++__first)
-	  erase(__first);
+	while (__first != __last)
+	  erase(__first++);
     }
 
   template<typename _Key, typename _Val, typename _KeyOfValue,
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc
new file mode 100644
index 00000000000..a65c1a9d002
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc
@@ -0,0 +1,45 @@
+// Copyright (C) 2004 Free Software Foundation
+//
+// 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.
+
+#include <set>
+#include <testsuite_hooks.h>
+
+// libstdc++/17948
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  typedef set<int>::size_type size_type;
+
+  set<int> s;
+    
+  s.insert(2);
+  s.insert(3);
+
+  size_type x = s.erase(3);
+
+  VERIFY( s.size() == 1 );
+  VERIFY( x == 1 );
+}
+
+int main ()
+{
+  test01();
+  return 0;
+}