diff --git a/buildsys.mk.in b/buildsys.mk.in
index def054d..0930cd4 100644
--- a/buildsys.mk.in
+++ b/buildsys.mk.in
@@ -60,6 +60,7 @@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
 INSTALL_LIB = @INSTALL_LIB@
 UNINSTALL_LIB = @UNINSTALL_LIB@
 CLEAN_LIB = @CLEAN_LIB@
+AS_DEPENDS = @AS_DEPENDS@
 CC_DEPENDS = @CC_DEPENDS@
 CXX_DEPENDS = @CXX_DEPENDS@
 OBJC_DEPENDS = @OBJC_DEPENDS@
diff --git a/configure.ac b/configure.ac
index 1d2c925..1dfb708 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,9 +121,6 @@ AS_IF([test x"$GOBJC" = x"yes"], [
 	])
 ])
 
-BUILDSYS_INIT
-BUILDSYS_TOUCH_DEPS
-
 dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
 dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
 AC_SUBST(CPP)
diff --git a/m4/buildsys.m4 b/m4/buildsys.m4
index 969978e..6afd8c6 100644
--- a/m4/buildsys.m4
+++ b/m4/buildsys.m4
@@ -21,7 +21,7 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 dnl POSSIBILITY OF SUCH DAMAGE.
 dnl
 
-AC_DEFUN([BUILDSYS_INIT], [
+AC_CONFIG_COMMANDS_PRE([
 	AC_SUBST(CC_DEPENDS, $GCC)
 	AC_SUBST(CXX_DEPENDS, $GXX)
 	AC_SUBST(OBJC_DEPENDS, $GOBJC)
@@ -73,6 +73,15 @@ AC_DEFUN([BUILDSYS_INIT], [
 	])
 ])
 
+AC_CONFIG_COMMANDS_POST([
+	${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
+	for i in $(find . -name Makefile); do
+		DEPSFILE="$(dirname $i)/.deps"
+		test -f "$DEPSFILE" && rm "$DEPSFILE"
+		touch -t 0001010000 "$DEPSFILE"
+	done
+])
+
 AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
 	AC_REQUIRE([AC_CANONICAL_HOST])
 	AC_MSG_CHECKING(whether we need an implib)
@@ -181,12 +190,3 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 	AC_SUBST(UNINSTALL_LIB)
 	AC_SUBST(CLEAN_LIB)
 ])
-
-AC_DEFUN([BUILDSYS_TOUCH_DEPS], [
-	${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
-	for i in $(find . -name Makefile); do
-		DEPSFILE="$(dirname $i)/.deps"
-		test -f "$DEPSFILE" && rm "$DEPSFILE"
-		touch -t 0001010000 "$DEPSFILE"
-	done
-])