diff --git a/acinclude.m4 b/acinclude.m4
index 2fe2e323..4c60e33b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,7 +4,10 @@ AC_DEFUN([AC_DEFINE_DIR], [
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
   eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
   AC_SUBST($1, "$ac_define_dir")
   AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
   test "$prefix_NONE" && prefix=NONE
diff --git a/configure.ac b/configure.ac
index a7a642df..e3071c21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,7 +321,7 @@ if test "x$GCC" = "xyes"; then
 	X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS"
 fi
 
-X11_DATADIR="${datarootdir}/X11"
+X11_DATADIR="${datadir}/X11"
 AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
 AC_SUBST(X11_DATADIR)