diff --git a/ChangeLog b/ChangeLog
index 931a1a0146..7cb7c3523b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-27  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #15007]
+	* stdlib/stdlib.h: Update guards for qecvt.
+	* stdlib/bits/stdlib-ldbl.h: Sync guards for qecvt etc with
+	<stdlib.h>.
+
 2013-04-27  Allan McRae  <allan@archlinux.org>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Update.
diff --git a/NEWS b/NEWS
index e8e7468055..9bc03b5623 100644
--- a/NEWS
+++ b/NEWS
@@ -12,10 +12,10 @@ Version 2.18
   10060, 10062, 10357, 11120, 11561, 12723, 13550, 13889, 13951, 13988,
   14142, 14176, 14200, 14280, 14293, 14317, 14327, 14478, 14496, 14686,
   14812, 14888, 14920, 14964, 14981, 14982, 14985, 14994, 14996, 15003,
-  15006, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15160, 15214,
-  15232, 15234, 15283, 15285, 15287, 15304, 15305, 15307, 15309, 15327,
-  15330, 15335, 15336, 15337, 15342, 15346, 15361, 15366, 15394, 15405,
-  15406.
+  15006, 15007, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15160,
+  15214, 15232, 15234, 15283, 15285, 15287, 15304, 15305, 15307, 15309,
+  15327, 15330, 15335, 15336, 15337, 15342, 15346, 15361, 15366, 15394,
+  15405, 15406.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).
diff --git a/stdlib/bits/stdlib-ldbl.h b/stdlib/bits/stdlib-ldbl.h
index 1e1bcefaac..a606fd3d09 100644
--- a/stdlib/bits/stdlib-ldbl.h
+++ b/stdlib/bits/stdlib-ldbl.h
@@ -30,12 +30,10 @@ __END_NAMESPACE_C99
 __LDBL_REDIR1_DECL (strtold_l, strtod_l)
 #endif
 
-#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
-# ifdef __USE_MISC
+#ifdef __USE_MISC
 __LDBL_REDIR1_DECL (qecvt, ecvt)
 __LDBL_REDIR1_DECL (qfcvt, fcvt)
 __LDBL_REDIR1_DECL (qgcvt, gcvt)
 __LDBL_REDIR1_DECL (qecvt_r, ecvt_r)
 __LDBL_REDIR1_DECL (qfcvt_r, fcvt_r)
-# endif
 #endif
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 4b839441c3..99a830dc14 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -823,9 +823,9 @@ extern char *fcvt (double __value, int __ndigit, int *__restrict __decpt,
    be written to BUF.  */
 extern char *gcvt (double __value, int __ndigit, char *__buf)
      __THROW __nonnull ((3)) __wur;
+#endif
 
-
-# ifdef __USE_MISC
+#ifdef __USE_MISC
 /* Long double versions of above functions.  */
 extern char *qecvt (long double __value, int __ndigit,
 		    int *__restrict __decpt, int *__restrict __sign)
@@ -854,8 +854,7 @@ extern int qfcvt_r (long double __value, int __ndigit,
 		    int *__restrict __decpt, int *__restrict __sign,
 		    char *__restrict __buf, size_t __len)
      __THROW __nonnull ((3, 4, 5));
-# endif	/* misc */
-#endif	/* use MISC || use X/Open Unix */
+#endif	/* misc */
 
 
 __BEGIN_NAMESPACE_STD