diff --git a/Makefile.am b/Makefile.am
index 7c03294a0..e7f59d93b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ EXTRA_DIST += \
 	README.win32 \
 	Makefile.win32 \
 	build/Makefile.win32.common \
+	build/Makefile.win32.inform \
 	build/Makefile.win32.features \
 	build/Makefile.win32.features-h \
 	$(NULL)
diff --git a/Makefile.win32 b/Makefile.win32
index f475246cb..e5a2c465e 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -2,7 +2,7 @@
 # Edit build/Makefile.win32.common for customization
 
 top_srcdir = .
-include $(top_srcdir)/build/Makefile.win32.common
+include $(top_srcdir)/build/Makefile.win32.inform
 
 all: cairo
 
@@ -14,3 +14,9 @@ perf: inform
 
 test: inform
 	@$(MAKE) -C test -f Makefile.win32 test
+
+clean:
+	@$(MAKE) -C boilerplate -f Makefile.win32 clean
+	@$(MAKE) -C perf -f Makefile.win32 clean
+	@$(MAKE) -C src -f Makefile.win32 clean
+	@$(MAKE) -C test -f Makefile.win32 clean
diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common
index eb3fb6b97..01a38cd32 100644
--- a/build/Makefile.win32.common
+++ b/build/Makefile.win32.common
@@ -3,6 +3,7 @@ default: all
 #
 # Edit build/Makefile.win32.features to enable features to build
 #
+include $(top_srcdir)/build/Makefile.win32.inform
 include $(top_srcdir)/build/Makefile.win32.features
 include $(top_srcdir)/build/Makefile.win32.features-h
 
@@ -48,20 +49,6 @@ DEFAULT_ARFLAGS = -nologo
 CAIRO_LDFLAGS = $(DEFAULT_LDFLAGS) $(LDFLAGS)
 CAIRO_ARFLAGS = $(DEFAULT_ARFLAGS) $(LDFLAGS)
 
-inform:
-	@echo
-ifneq ($(CFG),release)
-ifneq ($(CFG),debug)
-	@echo "Invalid configuration "$(CFG)" specified."
-	@echo -n "You must specify a configuration when "
-	@echo "running make, e.g. make CFG=debug"
-	@echo
-	@echo -n "Possible choices for configuration are "
-	@echo "'release' and 'debug'"
-	@exit 1
-endif
-endif
-
 # Some generic rules
 
 $(CFG)/%.obj: %.c $(top_srcdir)/src/cairo-features.h
diff --git a/build/Makefile.win32.inform b/build/Makefile.win32.inform
new file mode 100644
index 000000000..ba1116505
--- /dev/null
+++ b/build/Makefile.win32.inform
@@ -0,0 +1,13 @@
+inform:
+	@echo
+ifneq ($(CFG),release)
+ifneq ($(CFG),debug)
+	@echo "Invalid configuration "$(CFG)" specified."
+	@echo -n "You must specify a configuration when "
+	@echo "running make, e.g. make CFG=debug"
+	@echo
+	@echo -n "Possible choices for configuration are "
+	@echo "'release' and 'debug'"
+	@exit 1
+endif
+endif