diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a25bc1896..8fdd68b68 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 20 20:46:28 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: Don't touch winver_stamp if mkvers.sh was unsuccessful.
+
 Tue Jun 20 17:41:30 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* mkvers.sh: Fix problem with handling of CVS tags causing .rc syntax
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index db9d927c6..cfd6a8b1f 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -204,8 +204,8 @@ version.cc winver.o: winver_stamp
 
 winver_stamp: mkvers.sh include/cygwin/version.h winver.rc $(DLL_OFILES)
 	@echo "Making version.o and winver.o";\
-	$(SHELL) ${word 1,$^} ${word 2,$^} ${word 3,$^} $(WINDRES); \
-	touch $@; \
+	$(SHELL) ${word 1,$^} ${word 2,$^} ${word 3,$^} $(WINDRES) && \
+	touch $@ && \
 	$(COMPILE_CXX) -o version.o version.cc
 
 cygrun.exe : cygrun.o $(LIB_NAME) $(w32api_lib)/libuser32.a \