diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile
index af95e8b..9cb608e 100644
--- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile
+++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile
@@ -6,6 +6,7 @@ include $(TOP)/configure/CONFIG
 #----------------------------------------------------
 # Create and install (or just install) into <top>/db
 # databases, templates, substitutions like this
+#DB += xxx.db
 DB += ISTTOKpfeiffer.db
 DB += pfeiffer.proto
 
diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile
index 2dbf9be..d2ea8cb 100644
--- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile
+++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile
@@ -23,6 +23,7 @@ ISTTOKrpi2_DBD += drvAsynSerialPort.dbd
 ISTTOKrpi2_DBD += asSupport.dbd
 
 # Add all the support libraries needed by this IOC
+#ISTTOKrpi2_LIBS += xxx
 ISTTOKrpi2_LIBS += asyn
 ISTTOKrpi2_LIBS += stream
 ISTTOKrpi2_LIBS += autosave
diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths
index 81e5e03..9cb26c0 100644
--- a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths
+++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths
@@ -1,7 +1,8 @@
 epicsEnvSet("IOC","iocISTTOKrpi2")
 epicsEnvSet("TOP","/home/pi/ISTTOK/epics/iocs/ISTTOKrpi2")
-epicsEnvSet("EPICS_BASE","/home/pi/Apps/epics7/epics-base")
+epicsEnvSet("EPICS_BASE","/home/pi/EPICS/epics-base")
 epicsEnvSet("HOME","/home/pi")
-epicsEnvSet("SUPPORT","/home/pi/Apps/epics7/support")
-epicsEnvSet("ASYN","/home/pi/Apps/epics7/support/asyn")
-epicsEnvSet("STREAM","/home/pi/Apps/epics7/support/StreamDevice")
+epicsEnvSet("SUPPORT","/home/pi/EPICS/support")
+epicsEnvSet("ASYN","/home/pi/EPICS/support/asyn")
+epicsEnvSet("STREAM","/home/pi/EPICS/support/stream")
+epicsEnvSet("AUTOSAVE","/home/pi/EPICS/support/autosave")
diff --git a/epics/iocs/RELEASE.local b/epics/iocs/RELEASE.local
index b82440a..1386f4f 100644
--- a/epics/iocs/RELEASE.local
+++ b/epics/iocs/RELEASE.local
@@ -1,23 +1,29 @@
 #RELEASE Location of external products
 HOME=/home/pi
-SUPPORT=$(HOME)/Apps/epics7/support
-#
-#
-ASYN=$(SUPPORT)/asyn
-STREAM=$(SUPPORT)/StreamDevice
-#CALC=$(SUPPORT)/calc
-AUTOSAVE = $(SUPPORT)/autosave
-DRVASYNI2C =$(SUPPORT)/drvAsynI2C
-#SNCSEQ=$(SUPPORT)/seq-2-2
 
+SUPPORT=$(HOME)/EPICS/support
+
+#  IPAC is only necessary if support for Greensprings IP488 is required
 #  IPAC release V2-7 or later is required.
+# IPAC=$(SUPPORT)/ipac-2-15
 #IPAC=
-#$(SUPPORT)/ipac-2-15
-#
-#  # SEQ is required for testIPServer
-#$(SUPPORT)/seq-2-2-5
+
+ASYN=$(SUPPORT)/asyn
+STREAM=$(SUPPORT)/stream
+AUTOSAVE = $(SUPPORT)/autosave
 #
+# SEQ is required for testIPServer
+#SNCSEQ=$(SUPPORT)/seq-2-2-5
+SNCSEQ=
+
+## For sCalcout support in asynOctet - applications include asynCalc.dbd
+#CALC=$(SUPPORT)/calc-3-7-3
 CALC=
 PCRE=
-#
-EPICS_BASE=$(HOME)/Apps/epics7/epics-base
+
+# If CALC was built with SSCAN support then SSCAN must be defined for testEpicsApp
+#SSCAN=$(SUPPORT)/sscan-2-11-3
+
+#  EPICS_BASE 3.14.6 or later is required
+EPICS_BASE=/home/pi/EPICS/epics-base
+