diff --git a/Makefile b/Makefile
index 5cf947c..b0500af 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,17 @@ include $(TOP)/configure/CONFIG
 
 # Directories to build, any order
 DIRS += configure
-DIRS += $(wildcard *App)
-DIRS += $(wildcard iocBoot)
+DIRS += pdbApp
+ifeq ($(BUILD_P2P),YES)
+DIRS += p2pApp
+endif
+DIRS += iocBoot
+
+p2pApp_DEPEND_DIRS += configure
+pdbApp_DEPEND_DIRS += configure
 
-# 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 26e8c16..96d48ea 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -38,5 +38,8 @@ 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