diff --git a/ChangeLog b/ChangeLog
index 5108ede5f4..1e430102f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-15  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5737]
+	* resolv/netdb.h: Make NI_MAXHOST and NI_MAXSERV available when
+	__USE_MISC is defined.
+
 2008-02-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/sys/timerfd.h: New file.
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 47669c8002..a260c487bc 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -612,7 +612,7 @@ struct gaicb
 #  define EAI_IDN_ENCODE  -105	/* IDN encoding failed.  */
 # endif
 
-# ifdef __USE_GNU
+# ifdef __USE_MISC
 #  define NI_MAXHOST      1025
 #  define NI_MAXSERV      32
 # endif