diff --git a/Makefile.am b/Makefile.am
index f88767c3..24cddecf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,10 +10,6 @@ EXTRA_DIST = \
 
 SUBDIRS	= simgear
 
-dist-hook:
-	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
-	rm -rf `find $(distdir)/projects -name CVS`
-
 #
 # Rule to build RPM distribution package
 #
diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index e13a9d72..9bd77efc 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -17,8 +17,7 @@ else
 SGTHREAD_DIR = 
 endif
 
-SUBDIRS = \
-	$(compatibility_DIR) \
+SUBDIRS_ALWAYS = \
 	xml \
 	debug \
 	misc \
@@ -28,13 +27,17 @@ SUBDIRS = \
 	io \
 	magvar \
 	math \
-	$(METAR_DIRS) \
 	nasal \
 	props \
 	route \
-	$(SG_EXTRA_DIRS) \
-	$(SGTHREAD_DIR) \
 	serial \
 	timing
 
-DIST_SUBDIRS = $(SUBDIRS) compatibility
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+	$(compatibility_DIR) \
+	$(METAR_DIRS) \
+	$(SG_EXTRA_DIRS) \
+	$(SGTHREAD_DIR)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads
+