diff --git a/ChangeLog b/ChangeLog
index b4f37a8f3e8..9fa1b8da7d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-18  Ludovic Courtès  <ludo@gnu.org>
+
+	* configure.in: Don't use the -R option (Bug#11251).
+
 2012-04-12  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls.
diff --git a/configure.in b/configure.in
index 78d81115443..e848964e7bc 100644
--- a/configure.in
+++ b/configure.in
@@ -3446,7 +3446,7 @@ case "$opsys" in
   ## had not yet been defined and was expanded to null.  Hence LD_SWITCH_SYSTEM
   ## had different values in configure (in ac_link) and src/Makefile.in.
   ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS.
-  gnu-linux) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX)" ;;
+  gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX_RPATH)" ;;
 
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac