diff --git a/TSRM/configure.ac b/TSRM/configure.ac
index 6f036727c88..c3ed326bce5 100644
--- a/TSRM/configure.ac
+++ b/TSRM/configure.ac
@@ -31,4 +31,5 @@ unistd.h \
 limits.h
 )
 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/Zend/configure.ac b/Zend/configure.ac
index 4d0cf4c018d..73a001a7df5 100644
--- a/Zend/configure.ac
+++ b/Zend/configure.ac
@@ -125,7 +125,8 @@ LIBZEND_OTHER_CHECKS
 ZEND_EXTRA_LIBS="$LIBS"
 LIBS=""
 AC_SUBST(ZEND_EXTRA_LIBS)
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 
 # Local Variables:
 # tab-width: 4
diff --git a/acinclude.m4 b/acinclude.m4
index 7556a347345..e04545ad05e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -94,7 +94,7 @@ dnl
 dnl PHP_SUBST_OLD(varname)
 dnl
 dnl Same as PHP_SUBST() but also substitutes all @VARNAME@
-dnl instances in every file passed to AC_OUTPUT()
+dnl instances in every file passed to AC_OUTPUT
 dnl
 AC_DEFUN([PHP_SUBST_OLD],[
   PHP_SUBST($1)
diff --git a/configure.ac b/configure.ac
index 98d567a5872..e7530f70a32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1567,7 +1567,8 @@ PHP_CHECK_CONFIGURE_OPTIONS
 dnl
 dnl Generate build files
 dnl
-AC_OUTPUT($ALL_OUTPUT_FILES, [], [
+AC_CONFIG_FILES([$ALL_OUTPUT_FILES])
+AC_CONFIG_COMMANDS([default],[],[
 
 if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
   REDO_ALL=yes
@@ -1698,6 +1699,7 @@ Check '[$]0 --help' for available options
 
 fi
 ])
+AC_OUTPUT
 
 dnl ## Local Variables:
 dnl ## tab-width: 4
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index e4b2029eb1c..f234e68ea8a 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -199,4 +199,4 @@ touch .deps
 
 AC_CONFIG_HEADERS([config.h])
 
-AC_OUTPUT()
+AC_OUTPUT