diff --git a/make/dirs.mk b/make/dirs.mk
index d210e25d..382fd31a 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -10,24 +10,29 @@ include $(MODDIR)/make/defs.mk
 SUBDIRS ?= $(FIND_SUBDIRS)
 
 ifeq ($(SUBDIRS),)
+
 all:
 subdirs:
 clean distclean:
 .DEFAULT:
 install:
+
 else
+.PHONY: $(SUBDIRS)
+
 all subdirs:
 	$(make_subdirs)
 
-install:
+$(MAKECMDGOALS):
 	$(make_subdirs_target)
 
-clean:
-	$(make_subdirs_target)
+clean: dirs.clean
+distclean: dirs.distclean clean
+
+dirs.clean:
 	rm -rf $(TEXTCLEAN) $(CLEAN) dist *.done *~ .*.swp *.tmp core *.rep
 
-distclean: rmdistclean clean
-rmdistclean:
+dirs.distclean:
 	rm -rf $(DISTCLEAN)
 
 .DEFAULT: