diff --git a/README.SELF-CONTAINED-EXTENSIONS b/README.SELF-CONTAINED-EXTENSIONS
index 0cc097f90c0..8e36ce39be4 100644
--- a/README.SELF-CONTAINED-EXTENSIONS
+++ b/README.SELF-CONTAINED-EXTENSIONS
@@ -16,7 +16,6 @@ PREPARING YOUR SYSTEM
   tools:
 
     GNU autoconf
-    GNU automake
     GNU libtool
     GNU m4
 
diff --git a/README.UNIX-BUILD-SYSTEM b/README.UNIX-BUILD-SYSTEM
index 54dcae3fc66..a184b909ba3 100644
--- a/README.UNIX-BUILD-SYSTEM
+++ b/README.UNIX-BUILD-SYSTEM
@@ -16,7 +16,7 @@ PHP Build System V5 Overview
   build-modules: builds and copies dynamic modules into modules/
   install-cli: installs the CLI only, so that the install-sapi
                target does only what its name says
-- finally abandoned automake (still requires aclocal at this time)
+- finally abandoned automake
 - changed some configure-time constructs to run at buildconf-time
 - upgraded shtool to 1.5.4
 - removed $(moduledir) (use EXTENSION_DIR)
diff --git a/configure.ac b/configure.ac
index 78f0fa937ff..a5f335e8ec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl include Zend specific macro definitions first
 dnl -------------------------------------------------------------------------
 sinclude(Zend/acinclude.m4)
 
-dnl Basic autoconf + automake initialization, generation of config.nice.
+dnl Basic autoconf initialization, generation of config.nice.
 dnl -------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
@@ -1438,7 +1438,7 @@ case $host_alias in
 esac
 
 dnl Silence warning: `ar: 'u' modifier ignored since 'D' is the default`
-dnl SEE https://www.mail-archive.com/automake-patches@gnu.org/msg07705.html
+dnl See https://github.com/php/php-src/pull/3017
 AC_SUBST(AR_FLAGS, [cr])
 
 dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX).
diff --git a/ext/xmlrpc/libxmlrpc/acinclude.m4 b/ext/xmlrpc/libxmlrpc/acinclude.m4
index b1d99bc3161..b425377b826 100644
--- a/ext/xmlrpc/libxmlrpc/acinclude.m4
+++ b/ext/xmlrpc/libxmlrpc/acinclude.m4
@@ -1,4 +1,4 @@
-# Local macros for automake & autoconf
+# Local macros for autoconf
 
 AC_DEFUN([XMLRPC_FUNCTION_CHECKS],[