diff --git a/.gitmodules b/.gitmodules
index 1d7e5c4f1..6688d9877 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,20 @@
 [submodule "modules/libcom"]
-	path = modules/libcom
-	url = ./
-	branch = libcom/master
+    path = modules/libcom
+    url = ./
+    branch = libcom/master
 [submodule "modules/database"]
-	path = modules/database
-	url = ./
-	branch = database/master
+    path = modules/database
+    url = ./
+    branch = database/master
 [submodule "modules/ca"]
-	path = modules/ca
-	url = ./
-	branch = ca/master
+    path = modules/ca
+    url = ./
+    branch = ca/master
+[submodule "modules/pvData"]
+    path = modules/pvData
+    url = https://github.com/epics-base/pvDataCPP
+    branch = master
+[submodule "modules/pvAccess"]
+    path = modules/pvAccess
+    url = https://github.com/epics-base/pvAccessCPP
+    branch = master
diff --git a/modules/Makefile b/modules/Makefile
index 3d988c771..ce94086e9 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -11,18 +11,21 @@ TOP = ..
 include $(TOP)/configure/CONFIG
 
 # Submodules for bundle build
-SUBMODULES += libcom ca database
+SUBMODULES += libcom
 
+SUBMODULES += ca
 ca_DEPEND_DIRS = libcom
+
+SUBMODULES += database
 database_DEPEND_DIRS = ca
 
+SUBMODULES += pvData
+pvData_DEPEND_DIRS = libcom
+
+SUBMODULES += pvAccess
+pvAccess_DEPEND_DIRS = pvData
+
 # Add any checked-out submodules to DIRS
-define SUBMODULE_template
-ifneq ($(wildcard $1/Makefile),)
-DIRS += $1
-endif
-endef
-$(foreach mod, $(SUBMODULES), \
-    $(eval $(call SUBMODULE_template,$(strip $(mod)))))
+DIRS += $(subst /,,$(dir $(wildcard $(addsuffix /Makefile, $(SUBMODULES)))))
 
 include $(TOP)/configure/RULES_DIRS
diff --git a/modules/pvAccess b/modules/pvAccess
new file mode 160000
index 000000000..ed9be79ff
--- /dev/null
+++ b/modules/pvAccess
@@ -0,0 +1 @@
+Subproject commit ed9be79ff4dc69e9f23e252084493f52ad4a6ab7
diff --git a/modules/pvData b/modules/pvData
new file mode 160000
index 000000000..2f6966505
--- /dev/null
+++ b/modules/pvData
@@ -0,0 +1 @@
+Subproject commit 2f69665056969d8d93c61fab836ccdf99611247d