diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d29909ad00fd23c929ac2532d94ef940e364eb55..d3ad981c639bc1798578df22038f6196196568af 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+006-03-13  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/postypes.h (fpos<>::operator==, operator!=): Remove,
+	exploit conversion to streamoff.
+	* testsuite/27_io/fpos/mbstate_t/5.cc: New.
+
 2006-03-12  Howard Hinnant  <hhinnant@apple.com>
 
 	* testsuite/27_io/basic_filebuf/underflow/char/10097.cc:
diff --git a/libstdc++-v3/include/bits/postypes.h b/libstdc++-v3/include/bits/postypes.h
index 97ab8d1e08993809ab4af0e01b0dd3625c125b30..f1e75ac1d521b4494f361d5c7223be78eb256f9b 100644
--- a/libstdc++-v3/include/bits/postypes.h
+++ b/libstdc++-v3/include/bits/postypes.h
@@ -1,6 +1,6 @@
 // Position types -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -119,6 +119,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       /// Convert to streamoff.
       operator streamoff() const { return _M_off; }
 
+      // NB: Via conversion to streamoff, two fpos objects can be compared.
+      // The standard only requires that operator== must be an equivalence
+      // relation.  In this implementation two fpos objects belong to the
+      // same equivalence class if the contained offsets compare equal.
+
       /// Remember the value of @a st.
       void
       state(_StateT __st)
@@ -129,20 +134,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       state() const
       { return _M_state; }
 
-      // The standard only requires that operator== must be an
-      // equivalence relation. In this implementation two fpos<StateT>
-      // objects belong to the same equivalence class if the contained
-      // offsets compare equal.
-      /// Test if equivalent to another position.
-      bool
-      operator==(const fpos& __other) const
-      { return _M_off == __other._M_off; }
-
-      /// Test if not equivalent to another position.
-      bool
-      operator!=(const fpos& __other) const
-      { return _M_off != __other._M_off; }
-
       // The standard requires that this operator must be defined, but
       // gives no semantics. In this implemenation it just adds it's
       // argument to the stored offset and returns *this.
diff --git a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/5.cc b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/5.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c85b84236335e66133600ae8c1980c07f241e4e0
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/5.cc
@@ -0,0 +1,47 @@
+// { dg-do compile }
+
+// 2006-03-13  Paolo Carlini  <pcarlini@suse.de>
+
+// 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.
+
+// 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.
+
+// 27.4.3 template class fpos
+
+#include <ios>
+
+void test01()
+{
+  bool test01, test02;
+
+  std::streampos pos01(-1), pos02(0);
+
+  test01 = pos01 == -1;
+  test01 = -1 == pos01;  
+
+  test02 = pos02 != -1;
+  test02 = -1 != pos02;
+}