diff --git a/Makefile.am b/Makefile.am
index eac14e5..97d479d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
+EXTRA_DIST = tools win32
+
 SUBDIRS = ftk flaim sql xflaim
 
 rpms srcrpm:
@@ -7,5 +9,8 @@ rpms srcrpm:
  	  $(MAKE) -C $$dir $@; \
 	done
 
+dist-hook:
+	-rm -rf `find $(distdir) -name .svn`
+
 .PHONY: rpms srcrpm
 
diff --git a/flaim/Makefile.am b/flaim/Makefile.am
index e1d6de4..868d8f4 100644
--- a/flaim/Makefile.am
+++ b/flaim/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = GNUMakefile debian netware
+EXTRA_DIST = GNUMakefile debian netware win32
 
 SUBDIRS = $(subdirs) src util sample docs obs
 
diff --git a/ftk/Makefile.am b/ftk/Makefile.am
index 8851433..cc8bedf 100644
--- a/ftk/Makefile.am
+++ b/ftk/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = GNUMakefile debian netware
+EXTRA_DIST = GNUMakefile debian netware win32
 
 SUBDIRS = src util obs
 
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 6583433..68c96a6 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = GNUMakefile
+EXTRA_DIST = GNUMakefile win32
 
 SUBDIRS = $(subdirs) src obs
 
diff --git a/xflaim/Makefile.am b/xflaim/Makefile.am
index ec31410..7012584 100644
--- a/xflaim/Makefile.am
+++ b/xflaim/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = GNUMakefile INSTALL.W32 debian netware
+EXTRA_DIST = GNUMakefile INSTALL.W32 debian netware win32
 
 SUBDIRS = $(subdirs) src util sample docs obs