diff --git a/configure.ac b/configure.ac
index db635a7..f374b66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,6 +149,11 @@ dnl they will reside and should use these static_* values.
 dnl Ensure that all static_* are fully expanded.
 
 eval static_datadir="$datadir"
+old_val=""
+until test "$static_datadir" = "$old_val"; do
+	old_val="$static_datadir"
+	eval static_datadir="$static_datadir"
+done
 
 eval static_bindir="$bindir"
 old_val=""
diff --git a/debian/control b/debian/control
index 25d22c5..d04900f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Ardo van Rangelrooij <ardo@debian.org>,
            W. Borgert <debacle@debian.org>,
            Daniel Leidert (dale) <daniel.leidert@wgdd.de>,
            Gianfranco Costamagna <locutusofborg@debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: dh-autoreconf,
+               debhelper (>= 9),
                libxml-sax-perl,
                opensp,
                sp,
diff --git a/debian/rules b/debian/rules
index dbd1563..3a9804e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autoreconf
 
 PACKAGE := docbook2x