diff --git a/Makefile.in b/Makefile.in
index 80002a2cdfe..085fb3c01e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,6 +70,10 @@ INSTALLDIRS = $(DESTDIR)$(datadir)/aclocal
 config.status: configure
 	@./config.status --recheck
 
+include/config.h: include/stamp-h
+include/stamp-h: include/config.h.in config.status
+	@./config.status include/config.h include/stamp-h
+
 wine: $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
 
@@ -114,7 +118,7 @@ RECURSE_TARGETS = \
 	$(TESTSUBDIRS:%=%/__test__) \
 	$(TESTSUBDIRS:%=%/__testclean__)
 
-depend $(RECURSE_TARGETS): $(MAKEDEP)
+depend $(RECURSE_TARGETS): $(MAKEDEP) include/config.h
 
 $(MAKEDEP):
 	@cd $(TOOLSDIR)/tools && $(MAKE) makedep
@@ -139,7 +143,7 @@ clean::
 	$(RM) wine
 
 distclean:: clean
-	$(RM) config.* configure.lineno TAGS tags include/config.h
+	$(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h
 	$(RM) -r autom4te.cache
 
 .PHONY: manpages htmlpages sgmlpages distclean
diff --git a/configure b/configure
index 7934c02cef8..801ec4fd079 100755
--- a/configure
+++ b/configure
@@ -23778,6 +23778,9 @@ Makefile: dummy
 
 
 
+ac_config_commands="$ac_config_commands include/stamp-h"
+
+
 ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv"
 
 ac_config_commands="$ac_config_commands dlls/gdi/mfdrv"
@@ -24354,6 +24357,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
+    "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;;
     "dlls/gdi/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;;
     "dlls/gdi/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;;
     "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;;
@@ -25361,6 +25365,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
+    "include/stamp-h":C) echo timestamp > include/stamp-h ;;
     "dlls/gdi/enhmfdrv":C) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5
 echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;;
     "dlls/gdi/mfdrv":C) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5
diff --git a/configure.ac b/configure.ac
index 3430985d565..9a4be027853 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1482,6 +1482,8 @@ Makefile: dummy
 
 AH_TOP([#define __WINE_CONFIG_H])
 
+AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
+
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls)
diff --git a/include/.gitignore b/include/.gitignore
index 4276dd87099..d782fca8716 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -37,6 +37,7 @@
 /shldisp.h
 /shobjidl.h
 /shtypes.h
+/stamp-h
 /strmif.h
 /tom.h
 /unknwn.h