diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 12ac61d6d616..4559f79b2f94 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* include/std/charconv (__unsigned_least_t): Fix number of closing >s for
+	!_GLIBCXX_USE_INT128.
+
 2017-10-02  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/Makefile.am: Add new <charconv> header.
diff --git a/libstdc++-v3/include/std/charconv b/libstdc++-v3/include/std/charconv
index b8221e4e434b..e5d6c106f70b 100644
--- a/libstdc++-v3/include/std/charconv
+++ b/libstdc++-v3/include/std/charconv
@@ -81,7 +81,11 @@ namespace __detail
 #if _GLIBCXX_USE_INT128
 	conditional_t<(sizeof(_Tp) <= sizeof(__int128)), unsigned __int128,
 #endif
-	void>>>>;
+	void
+#if _GLIBCXX_USE_INT128
+	>
+#endif
+	>>>;
 
   // Generic implementation for arbitrary bases.
   template<typename _Tp>