--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-zip
 
-SUBDIRS = lib include doc examples win32 vq
+SUBDIRS = lib include doc examples vq
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
@@ -15,14 +15,15 @@
 # to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
 # because of it, breaking make dist.  This works just as well.
 EXTRA_DIST = \
-	todo.txt macos macosx autogen.sh \
+	todo.txt autogen.sh \
 	libvorbis.spec libvorbis.spec.in \
 	vorbis.m4 \
 	vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
 	vorbis-uninstalled.pc.in \
 	vorbisenc-uninstalled.pc.in \
 	vorbisfile-uninstalled.pc.in \
-	debian
+	debian macos macosx win32
+
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-docs
 
@@ -31,6 +32,7 @@
 	rm -rf `find $(distdir)/debian -name "Makefile*"`
 	rm -rf `find $(distdir)/macos -name .svn`
 	rm -rf `find $(distdir)/macosx -name .svn`
+	rm -rf `find $(distdir)/win32 -name .svn`
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"