diff --git a/Makefile b/Makefile
index b0500af..5cf947c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,11 @@ include $(TOP)/configure/CONFIG
 
 # Directories to build, any order
 DIRS += configure
-DIRS += pdbApp
-ifeq ($(BUILD_P2P),YES)
-DIRS += p2pApp
-endif
-DIRS += iocBoot
-
-p2pApp_DEPEND_DIRS += configure
-pdbApp_DEPEND_DIRS += configure
+DIRS += $(wildcard *App)
+DIRS += $(wildcard iocBoot)
 
+# iocBoot depends on all *App dirs
 iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
-
 testApp_DEPEND_DIRS += p2pApp pdbApp
 
 # Add any additional dependency rules here:
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 96d48ea..26e8c16 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -38,8 +38,5 @@ CHECK_RELEASE = YES
 # we don't actually use 'rset' explicitly, but quiet some warnings
 USR_CPPFLAGS += -DUSE_TYPED_RSET
 
-# Whether to build the (incomplete) PVA gateway
-#BUILD_P2P = NO
-
 -include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local