diff --git a/ChangeLog b/ChangeLog
index bba31fa6bd..4e6071676d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 28 17:32:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* config/mh-windows:  Add rules for building MSVC makefiles.
+
+Thu Oct 24 09:22:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* Undo my previous change.
+
 Thu Oct 24 12:12:04 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* Makefile.in (EXTRA_GCC_FLAGS): Pass down GCC_FOR_TARGET
diff --git a/config/mh-windows b/config/mh-windows
index e5f606c333..a5cc5d611d 100644
--- a/config/mh-windows
+++ b/config/mh-windows
@@ -2,3 +2,15 @@ CC=cc
 CFLAGS=
 RANLIB=true
 AR_FLAGS=
+
+.PHONY: windows
+windows: nmake.mak
+	@echo "Don't forget to setup setvars.mak!"
+
+nmake.mak: to-be-built
+	@echo Building nmake files
+	@$(srcdir)/gdb/mswin/genmakes
+
+to-be-built:
+	@echo Recording commands
+	@$(srcdir)/gdb/mswin/recordit