diff --git a/ChangeLog b/ChangeLog
index f3cca14d0e..46abc652cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2017-10-13  Joseph Myers  <joseph@codesourcery.com>
 
+	* stdlib/strfroml.c: Include <bits/floatn.h>.
+	[__HAVE_FLOAT128 && !__HAVE_DISTINCT_FLOAT128] (strfromf128):
+	Define before include of <stdlib.h> and undefine afterwards, then
+	define as weak alias.
+
 	* sysdeps/ieee754/ldbl-64-128/s_nextafterl.c (weak_alias):
 	Undefine and restore default definition.  Use
 	libm_alias_ldouble_other.
diff --git a/stdlib/strfroml.c b/stdlib/strfroml.c
index f8c8a4fcc5..bd6ebca0ad 100644
--- a/stdlib/strfroml.c
+++ b/stdlib/strfroml.c
@@ -16,7 +16,19 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <bits/floatn.h>
+
 #define FLOAT		long double
 #define STRFROM		strfroml
 
+#if __HAVE_FLOAT128 && !__HAVE_DISTINCT_FLOAT128
+# define strfromf128 __hide_strfromf128
+# include <stdlib.h>
+# undef strfromf128
+#endif
+
 #include "strfrom-skeleton.c"
+
+#if __HAVE_FLOAT128 && !__HAVE_DISTINCT_FLOAT128
+weak_alias (strfroml, strfromf128)
+#endif