diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 843e5fccfbf36be3b74472b9156ca32d9620921a..3feaa99932e3dee6aef1b459b7348daac41978b9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-28  Paolo Carlini  <pcarlini@suse.de>
+	    Roger Sayle  <roger@eyesopen.com>
+
+	* testsuite/25_algorithms/nth_element/2.cc: New.
+
 2006-08-27  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/28830
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ed8635033b8c6e24953202f020847502a7c8f13d
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
@@ -0,0 +1,75 @@
+// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 25.3.2 [lib.alg.nth.element]
+
+#include <vector>
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+void
+test_set(std::vector<int>& v, int size)
+{
+  v.clear();
+
+  for (int i = 0; i < size; i += 4)
+    {
+      v.push_back(i / 2);
+      v.push_back((size - 2) - (i / 2));
+    }
+  for (int i = 1; i < size; i += 2)
+    v.push_back(i);
+}
+
+void
+do_test01(int size)
+{
+  bool test __attribute__((unused)) = true;
+
+  std::vector<int> v, s;
+
+  for (int j = 0; j < size; ++j)
+    {
+      test_set(v, size);
+      s = v;
+      std::sort(s.begin(), s.end());
+      
+      std::nth_element(v.begin(), v.begin() + j, v.end());
+
+      VERIFY( v[j] == s[j] );
+      
+      for (int i = 0; i < j; ++i)
+	VERIFY( !(v[j] < v[i]) );
+
+      for (int i = j; i < v.size(); ++i)
+	VERIFY( !(v[i] < v[j]) );
+    }
+}
+
+void
+test01()
+{
+  for (int size = 4; size <= 1 << 10; size <<= 1)
+    do_test01(size);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}