diff --git a/aclocal.m4 b/aclocal.m4
index 5f2a09eb8..32ca987c3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -12,6 +12,7 @@
 # PARTICULAR PURPOSE.
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_include([m4/_ac_am_config_header_hook.m4])
 m4_include([m4/_ax_c_underscores_match_if.m4])
 m4_include([m4/ax_c99_strtod.m4])
 m4_include([m4/ax_c_picflag.m4])
diff --git a/m4/_ac_am_config_header_hook.m4 b/m4/_ac_am_config_header_hook.m4
new file mode 100644
index 000000000..b0113a7eb
--- /dev/null
+++ b/m4/_ac_am_config_header_hook.m4
@@ -0,0 +1,13 @@
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp file name are based on the header name.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[
+_config_header=$1
+_stamp_name=stamp-`expr //$_config_header : '.*/\([[^./]]*\)\.[[^./]]*$'`-h
+echo "timestamp for $_config_header" > `AS_DIRNAME(["$_config_header"])`/[]$_stamp_name
+]) #_AC_AM_CONFIG_HEADER_HOOK