diff --git a/configure/CONFIG_PVA_ISIS b/configure/CONFIG_PVA_ISIS
new file mode 100644
index 00000000..d30c0ed9
--- /dev/null
+++ b/configure/CONFIG_PVA_ISIS
@@ -0,0 +1,12 @@
+# QSRV/PVXS for PVA
+#ifdef PVXS_MAJOR_VERSION # prefer QSRV2 :)
+#$(APPNAME)_DBD += pvxsIoc.dbd
+#$(APPNAME)_LIBS += pvxsIoc pvxs
+#else
+ifdef EPICS_QSRV_MAJOR_VERSION # fallback to QSRV1
+$(APPNAME)_LIBS += qsrv
+$(APPNAME)_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
+$(APPNAME)_DBD += PVAServerRegister.dbd
+$(APPNAME)_DBD += qsrv.dbd
+endif
+#endif
diff --git a/modules/database/src/template/top/iocApp/src/build.mak b/modules/database/src/template/top/iocApp/src/build.mak
index 6836d126..caa90866 100644
--- a/modules/database/src/template/top/iocApp/src/build.mak
+++ b/modules/database/src/template/top/iocApp/src/build.mak
@@ -65,6 +65,8 @@ $(APPNAME)_SRCS_vxWorks += -nil-
 # Add support from base/src/vxWorks if needed
 #$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
+include $(CONFIG)/CONFIG_PVA_ISIS
+
 # Finally link to the EPICS Base libraries
 $(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS)