diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index baf7d57..1e82bb0 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -35,6 +35,8 @@
 #MSI=$(EPICS_SITE_TOP)/extensions/$(EXTENSIONS_MODULE_VERSION)/bin/$(EPICS_HOST_ARCH)/msi
 #MSI=msi
 
+WITH_PVA=$(if $(strip $(EPICS_PVA_MAJOR_VERSION) $(PVXS_MAJOR_VERSION)),YES,NO)
+
 -include $(SUPPORT)/configure/CONFIG_SITE
 
 # These allow developers to override the CONFIG_SITE variable
diff --git a/iocAdmin/Db/Makefile b/iocAdmin/Db/Makefile
index efc38aa..4008c63 100644
--- a/iocAdmin/Db/Makefile
+++ b/iocAdmin/Db/Makefile
@@ -12,6 +12,9 @@ include $(TOP)/configure/CONFIG
 # databases, templates, substitutions like this
 #
 DB += siteEnvVars.db
+ifeq ($(strip $(WITH_PVA)),YES)
+  DB += epicsPVAEnvVars.db
+endif
 DB += iocAdminScanMon.db
 DB += ioc.db
 DB += iocRTOS.db
diff --git a/iocAdmin/Db/epicsPVAEnvVars.substitutions b/iocAdmin/Db/epicsPVAEnvVars.substitutions
new file mode 100644
index 0000000..77b39d7
--- /dev/null
+++ b/iocAdmin/Db/epicsPVAEnvVars.substitutions
@@ -0,0 +1,28 @@
+#==============================================================================
+#
+# Abs:  Records for EPICS environment variables
+#
+# Name: epicsEnvVars.substitutions
+#
+#==============================================================================
+#
+file iocEnvVar.template
+{
+    pattern
+    { ENVNAME                    , ENVVAR                           , ENVTYPE}
+    { PVA_ADDR_LIST              , EPICS_PVA_ADDR_LIST              , env  }
+    { PVA_AUTO_ADDR_LIST         , EPICS_PVA_AUTO_ADDR_LIST         , env  }
+    { PVA_BEACON_PERIOD          , EPICS_PVA_BEACON_PERIOD          , env  }
+    { PVA_CONN_TMO               , EPICS_PVA_CONN_TMO               , env  }
+    { PVA_MAX_ARRAY_BYTES        , EPICS_PVA_MAX_ARRAY_BYTES        , env  }
+    { PVA_MAX_SEARCH_PERIOD      , EPICS_PVA_MAX_SEARCH_PERIOD      , env  }
+    { PVA_SERVER_PORT            , EPICS_PVA_SERVER_PORT            , env  }
+
+    { PVAS_INTF_ADDR_LIST        , EPICS_PVAS_INTF_ADDR_LIST        , env  }
+    { PVAS_BEACON_ADDR_LIST      , EPICS_PVAS_BEACON_ADDR_LIST      , env  }
+    { PVAS_AUTO_BEACON_ADDR_LIST , EPICS_PVAS_AUTO_BEACON_ADDR_LIST , env  }
+    { PVAS_BEACON_PERIOD         , EPICS_PVAS_BEACON_PERIOD         , env  }
+    { PVAS_BROADCAST_PORT        , EPICS_PVAS_BROADCAST_PORT        , env  }
+    { PVAS_PROVIDER_NAMES        , EPICS_PVAS_PROVIDER_NAMES        , env  }
+    { PVAS_SERVER_PORT           , EPICS_PVAS_SERVER_PORT           , env  }
+}