diff --git a/Makefile b/Makefile
index 9bebddbfc..786ccefba 100644
--- a/Makefile
+++ b/Makefile
@@ -251,10 +251,11 @@ links : bindir
 #########################################################
 
 install : touch-dummy
-	if test -d bin ; then \
-	mkdir -p $(PREFIX) ; for x in `find . -name *.x -type f` ; do \
+	@if test -d bin ; then mkdir -p $(PREFIX) ; \
+	for x in `find . -path ./test-suite -prune -o -name *.x -type f` ; do \
 		cp $$x $(PREFIX)/ ; done ; \
 	fi
+	@echo 'Quantum ESPRESSO binaries installed in $(PREFIX)'
 
 #########################################################
 # Run test-suite for numerical regression testing
diff --git a/install/plugins_makefile b/install/plugins_makefile
index 0e0e2d8f6..78f14d9c9 100644
--- a/install/plugins_makefile
+++ b/install/plugins_makefile
@@ -511,6 +511,8 @@ epw_veryclean: epw_clean
 # dir is not deleted for compatibility with the repository
 
 epw_distclean:
+	if test -d ../EPW; then (cd ../EPW; \
+	$(MAKE) distclean); fi
 	rm -f ../archive/$(EPW).tar.gz
 
 w90_clean: