diff --git a/ChangeLog b/ChangeLog
index 6cf157acb3..c0f58f5214 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-15  Herman ten Brugge  <hermantenbrugge@home.nl>
+
+	[BZ #23007]
+	* stdlib/strtod_l.c (____STRTOF_INTERNAL): Return NaN of
+	appropriate sign.
+
 2018-06-14  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #23290]
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
index a09b093fce..cbff18b49d 100644
--- a/stdlib/strtod_l.c
+++ b/stdlib/strtod_l.c
@@ -678,7 +678,7 @@ ____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group,
 	  if (endptr != NULL)
 	    *endptr = (STRING_TYPE *) cp;
 
-	  return retval;
+	  return negative ? -retval : retval;
 	}
 
       /* It is really a text we do not recognize.  */