diff --git a/autogen.sh b/autogen.sh
index 31494bbc79..d3d346d3bc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,12 +38,12 @@ test "$autoversion" != "" && {
 }
 
 case $autoversion in
-    *' '2.5[2-9])
+    *' '2.5[2-9]|*' '2.60|*' '2.60a)
 	EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.5[2-9]."
+	echo "LyX only supports autoconf 2.5[2-9]-2.60[a]."
 	exit 1
 	;;
 esac
diff --git a/configure.ac b/configure.ac
index d6ab6510ee..6d854b9f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,7 +285,7 @@ AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
+real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 14a4a874a9..986e135e5f 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -31,6 +31,7 @@ exec_prefix = @exec_prefix@
 transform = @program_transform_name@
 libdir = @libdir@
 includedir = @includedir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/intl
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c628cabe01..80305c5bf2 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -22,6 +22,7 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po