diff --git a/ChangeLog b/ChangeLog
index 48c1c58afc..ea8514f5db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/getconf.c (main): Also recognize names without the
+	__POSIX_ prefix.
+
+	* elf/Makefile (CFLAGS-dl-lookup.c): Define.
+
 2003-06-02  Bernd Schmidt  <bernds@redhat.com>
 
 	* sysdeps/i386/fpu/bits/mathinline.h (sqrt, __sqrtl, ldexp,
diff --git a/elf/Makefile b/elf/Makefile
index 003f77e12e..2622801dad 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -83,6 +83,7 @@ distribute	:= rtld-Rules \
 		   check-textrel.c dl-sysdep.h
 
 CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
 
 include ../Makeconfig
 
diff --git a/posix/getconf.c b/posix/getconf.c
index afe36018ce..0117b64ffc 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -957,7 +957,9 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
     usage ();
 
   for (c = vars; c->name != NULL; ++c)
-    if (!strcmp (c->name, argv[1]))
+    if (strcmp (c->name, argv[1]) == 0
+	|| (strncmp (c->name, "_POSIX_", 7) == 0
+	    && strcmp (c->name + 7, argv[1]) == 0))
       {
 	long int value;
 	size_t clen;