diff --git a/make/topdir.mk b/make/topdir.mk
index efeca9db..460db685 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -6,9 +6,10 @@ config:
 mrproper:distclean topdir.mrproper
 
 ifeq ($(ORDERED_SUBDIRS),)
-SUBDIRS                     ?= $(wildcard inst/pre make scripts contrib src libsrc \
-		 tools include lib bin util exe plugins conf config cfg \
-		 images htdocs tmpl doc test inst/post)
+SUBDIRS                     ?= $(dir $(wildcard $(addsuffix /Makefile,\
+		inst/pre make scripts contrib src libsrc \
+		tools include lib bin util exe plugins conf config cfg \
+		images htdocs tmpl doc test inst/post)))
 endif
 
 ifeq ($(USE_USER_URL),true)