diff --git a/configure/RELEASE b/configure/RELEASE
index 6934c90..1252dc5 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -21,12 +21,18 @@
 
 TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 
-# If using the sequencer, point SNCSEQ at its top directory:
-#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
+## Optional Modules ##
+# Comment out if not present
+
+# IOC statistics (cpu and mem usage, ...)
+#DEVIOCSTATS=$(EPICS_BASE)
+
+# automatic save with restore on boot
+#AUTOSAVE=$(EPICS_BASE)
+
+# logging of remote settings changes
+#CAPUTLOG=$(EPICS_BASE)
 
 # EPICS_BASE usually appears last so other apps can override stuff:
 EPICS_BASE=/usr/lib/epics
 
-# Set RULES here if you want to take build rules from somewhere
-# other than EPICS_BASE:
-#RULES=/path/to/epics/support/module/rules/x-y
diff --git a/devsupApp/Db/Makefile b/devsupApp/Db/Makefile
index 983981d..0be793b 100644
--- a/devsupApp/Db/Makefile
+++ b/devsupApp/Db/Makefile
@@ -12,6 +12,14 @@ include $(TOP)/configure/CONFIG
 # databases, templates, substitutions like this
 #DB += xxx.db
 
+ifneq ($(DEVIOCSTATS),)
+DB_INSTALLS += $(DEVIOCSTATS)/db/iocAdminSoft.db
+endif
+
+ifneq ($(AUTOSAVE),)
+DB_INSTALLS += $(firstword $(wildcard $(AUTOSAVE)/asApp/Db/save_restoreStatus.db $(AUTOSAVE)/db/save_restoreStatus.db))
+endif
+
 #----------------------------------------------------
 # If <anyname>.db template is not named <anyname>*.template add
 # <anyname>_template = <templatename>
diff --git a/devsupApp/src/Makefile b/devsupApp/src/Makefile
index 9478944..a7f07cb 100644
--- a/devsupApp/src/Makefile
+++ b/devsupApp/src/Makefile
@@ -40,6 +40,8 @@ DBD += softIocPy.dbd
 softIocPy_DBD += base.dbd
 softIocPy_DBD += pyDevSup.dbd
 
+softIocPy_DBD += system.dbd
+
 softIocPy$(PY_VER)_LIBS += pyDevSup$(PY_LD_VER)
 
 # softIocPy_registerRecordDeviceDriver.cpp derives from softIocPy.dbd
@@ -47,10 +49,21 @@ softIocPy$(PY_VER)_SRCS += softIocPy_registerRecordDeviceDriver.cpp
 
 # Build the main IOC entry point on workstation OSs.
 softIocPy$(PY_VER)_SRCS_DEFAULT += devsupMain.cpp
-softIocPy$(PY_VER)_SRCS_vxWorks += -nil-
 
-# Add support from base/src/vxWorks if needed
-#softIocPy$(PY_VER)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
+ifneq ($(DEVIOCSTATS),)
+softIocPy_DBD += devIocStats.dbd
+softIocPy$(PY_VER)_LIBS += devIocStats
+endif
+
+ifneq ($(AUTOSAVE),)
+softIocPy_DBD += asSupport.dbd
+softIocPy$(PY_VER)_LIBS += autosave
+endif
+
+ifneq ($(CAPUTLOG),)
+softIocPy_DBD += caPutLog.dbd
+softIocPy$(PY_VER)_LIBS += caPutLog
+endif
 
 # Finally link to the EPICS Base libraries
 softIocPy$(PY_VER)_LIBS += $(EPICS_BASE_IOC_LIBS)