diff --git a/Makefile b/Makefile
index 8767300b75..3731761498 100644
--- a/Makefile
+++ b/Makefile
@@ -380,7 +380,7 @@ _all: all
 	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest config.status menuselect.makeopts depend asterisk subdirs sounds
+all: cleantest config.status menuselect.makeopts depend asterisk subdirs
 
 config.status: configure
 	@CFLAGS="" ./configure
@@ -519,12 +519,13 @@ clean: clean-depend
 distclean: dist-clean
 
 dist-clean: clean
+	$(MAKE) -C mxml clean
+	$(MAKE) -C build_tools dist-clean
+	$(MAKE) -C sounds dist-clean
 	rm -f menuselect.makeopts makeopts makeopts.xml
 	rm -f config.log config.status
 	rm -f include/autoconfig.h
 	rm -f include/asterisk/buildopts.h
-	$(MAKE) -C mxml clean
-	$(MAKE) -C build_tools dist-clean
 
 datafiles: all
 	if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -540,6 +541,7 @@ datafiles: all
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
+	$(MAKE) -C sounds install
 
 update: 
 	@if [ -d .svn ]; then \
@@ -871,6 +873,7 @@ _uninstall:
 	rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
 	rm -rf $(DESTDIR)$(ASTMANDIR)/man8
 	for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+	$(MAKE) -C sounds uninstall
 
 uninstall: _uninstall
 	@echo " +--------- Asterisk Uninstall Complete -----+"  
diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index 5e6130b103..327c7d5882 100644
--- a/build_tools/menuselect.c
+++ b/build_tools/menuselect.c
@@ -24,7 +24,7 @@
  * \brief A menu-driven system for Asterisk module selection
  */
 
-#include "autoconfig.h"
+#include "asterisk.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -34,8 +34,6 @@
 #include "mxml/mxml.h"
 #include "menuselect.h"
 
-#include "asterisk.h"
-
 #include "asterisk/linkedlists.h"
 
 #undef MENUSELECT_DEBUG
diff --git a/build_tools/menuselect_curses.c b/build_tools/menuselect_curses.c
index 77f323a31a..180582a72c 100644
--- a/build_tools/menuselect_curses.c
+++ b/build_tools/menuselect_curses.c
@@ -24,7 +24,7 @@
  * \brief curses frontend for Asterisk module selection
  */
 
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/sounds/Makefile b/sounds/Makefile
index aa65a8794d..5a7a5904ca 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -37,12 +37,13 @@ MENUSELECT_MOH:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
 MENUSELECT_MOH:=$(subst -MP3,-mp3,$(MENUSELECT_MOH))
 MOH:=$(MENUSELECT_MOH:MOH-%=asterisk-moh-%.tar.gz)
 
-%.gz:
+%.tar.gz:
 	@wget --no-verbose --continue $(SOUNDS_URL)/$@
 
 all:	$(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
 
-clean:
+dist-clean:
+	rm -f *.tar.gz
 
 install: all
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds