diff --git a/Makefile b/Makefile
index 5e554a16..bb27ec02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #Makefile at top of application tree
 TOP = .
-include $(TOP)/config/CONFIG_APP
-DIRS += config
-DIRS += $(wildcard *App)
-DIRS += $(wildcard *app)
-DIRS += $(wildcard iocBoot)
-DIRS += $(wildcard iocboot)
-include $(TOP)/config/RULES_TOP
+include $(TOP)/configure/CONFIG
+DIRS := $(DIRS) $(filter-out $(DIRS), configure)
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *App))
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *app))
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocBoot))
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocboot))
+include $(TOP)/configure/RULES_TOP