diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 47777ac7c49..7b7e2b9c1f5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-25  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/locale_conv.h (__do_str_codecvt): Set __count.
+
 2015-06-24  François Dumont  <fdumont@gcc.gnu.org>
 
 	* include/bits/basic_string.h (basic_string<>::front()): Add !empty
diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h
index fd99499b8f6..146f78b38d0 100644
--- a/libstdc++-v3/include/bits/locale_conv.h
+++ b/libstdc++-v3/include/bits/locale_conv.h
@@ -61,6 +61,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       if (__first == __last)
 	{
 	  __outstr.clear();
+	  __count = 0;
 	  return true;
 	}