diff --git a/component/r-language/buildout.cfg b/component/r-language/buildout.cfg
index 28e845e7cad4929fce452933d6914e6048e5a8e9..0dba3edfbfff89e948f2cec476609038d64a417e 100644
--- a/component/r-language/buildout.cfg
+++ b/component/r-language/buildout.cfg
@@ -31,5 +31,5 @@ configure-options =
   --without-x
 environment =
   PATH=${gcc-fortran:location}/bin:%(PATH)s
-  CPPFLAGS=-I${bzip2:location}/include  -I${pcre:location}/include -I${readline5:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib -L${gcc-fortran:location}/lib64 -Wl,-rpath=${gcc-fortran:location}/lib64 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${bzip2:location}/include  -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib -L${gcc-fortran:location}/lib64 -Wl,-rpath=${gcc-fortran:location}/lib64 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
diff --git a/component/rpy2/buildout.cfg b/component/rpy2/buildout.cfg
index 4a1bdd78f5b411416d4f927a6083fc8f9f1a3427..36543fbff5a3bfdb59289937fe418d3aea6f9b9d 100644
--- a/component/rpy2/buildout.cfg
+++ b/component/rpy2/buildout.cfg
@@ -24,11 +24,11 @@ rpath =
   ${gcc-fortran:location}/lib
   ${gcc-fortran:location}/lib64
   ${pcre:location}/lib
-  ${readline5:location}/lib
+  ${readline:location}/lib
   ${xz-utils:location}/lib
 library-dirs =
   ${pcre:location}/lib
-  ${readline5:location}/lib
+  ${readline:location}/lib
   ${xz-utils:location}/lib
 include-dirs =
-  ${readline5:location}/include
+  ${readline:location}/include