diff --git a/ChangeLog b/ChangeLog
index 31902a0a3f..9738f7bd51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-11  Roland McGrath  <roland@hack.frob.com>
+
+	* configure.in (-z relro check): Fix test code to make the variable
+	truly const.
+	* configure: Regenerated.
+
 2011-07-11  Ulrich Drepper  <drepper@gmail.com>
 
 	* nscd/nscd.h (struct traced_file): Define.
diff --git a/configure b/configure
index ffeb89057f..d44659bb2c 100755
--- a/configure
+++ b/configure
@@ -6404,7 +6404,7 @@ else
 
 int _start (void) { return 42; }
 extern void _exit (int);
-const void *relro[] = { &_start, &_exit, 0 };
+const void *const relro[] = { &_start, &_exit, 0 };
 
 _ACEOF
     cat > conftest.awk <<\EOF
diff --git a/configure.in b/configure.in
index e18b343416..d40bc64ca2 100644
--- a/configure.in
+++ b/configure.in
@@ -1607,7 +1607,7 @@ EOF
     AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 int _start (void) { return 42; }
 extern void _exit (int);
-const void *relro[] = { &_start, &_exit, 0 };
+const void *const relro[] = { &_start, &_exit, 0 };
 ]])])
     cat > conftest.awk <<\EOF
 BEGIN {