diff --git a/modules/database/src/template/Makefile b/modules/database/src/template/Makefile
index 8dfc6c6f3..9eed8fc20 100644
--- a/modules/database/src/template/Makefile
+++ b/modules/database/src/template/Makefile
@@ -9,6 +9,11 @@ TEMPLATES += top/iocApp/Db/Makefile
 TEMPLATES += top/iocApp/src/Makefile
 TEMPLATES += top/iocApp/src/_APPNAME_Main.cpp
 
+TEMPLATES += top/supportApp/Makefile
+TEMPLATES += top/supportApp/Db/Makefile
+TEMPLATES += top/supportApp/src/Makefile
+TEMPLATES += top/supportApp/src/_APPNAME_.dbd
+
 TEMPLATES += top/exampleApp/Makefile
 TEMPLATES += top/exampleApp/Db/Makefile
 TEMPLATES += top/exampleApp/Db/circle.db
diff --git a/src/template/base/Makefile b/src/template/base/Makefile
index c758964b7..d03dc0841 100644
--- a/src/template/base/Makefile
+++ b/src/template/base/Makefile
@@ -14,11 +14,6 @@ TEMPLATES += top/configure/RULES.ioc
 TEMPLATES += top/configure/RULES_DIRS
 TEMPLATES += top/configure/RULES_TOP
 
-TEMPLATES += top/supportApp/Makefile
-TEMPLATES += top/supportApp/Db/Makefile
-TEMPLATES += top/supportApp/src/Makefile
-TEMPLATES += top/supportApp/src/_APPNAME_.dbd
-
 SCRIPTS_HOST += makeBaseApp.pl
 
 include $(TOP)/configure/RULES
diff --git a/src/template/base/top/supportApp/Db/Makefile b/src/template/base/top/supportApp/Db/Makefile
deleted file mode 100644
index 8eb97279d..000000000
--- a/src/template/base/top/supportApp/Db/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP=../..
-include $(TOP)/configure/CONFIG
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-#----------------------------------------------------
-# Create and install (or just install) into <top>/db
-# databases, templates, substitutions like this
-#DB += xxx.db
-
-#----------------------------------------------------
-# If <anyname>.db template is not named <anyname>*.template add
-# <anyname>_template = <templatename>
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
diff --git a/src/template/base/top/supportApp/Makefile b/src/template/base/top/supportApp/Makefile
deleted file mode 100644
index ab15bfb1c..000000000
--- a/src/template/base/top/supportApp/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOP = ..
-include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
-include $(TOP)/configure/RULES_DIRS
diff --git a/src/template/base/top/supportApp/src/Makefile b/src/template/base/top/supportApp/src/Makefile
deleted file mode 100644
index 941d94f8b..000000000
--- a/src/template/base/top/supportApp/src/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-#==================================================
-# build a support library
-
-LIBRARY_IOC += _APPNAME_
-
-# xxxRecord.h will be created from xxxRecord.dbd
-#DBDINC += xxxRecord
-# install _APPNAME_.dbd into <top>/dbd
-DBD += _APPNAME_.dbd
-
-# specify all source files to be compiled and added to the library
-#_APPNAME__SRCS += xxx
-
-_APPNAME__LIBS += $(EPICS_BASE_IOC_LIBS)
-
-#===========================
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
diff --git a/src/template/base/top/supportApp/src/_APPNAME_.dbd b/src/template/base/top/supportApp/src/_APPNAME_.dbd
deleted file mode 100644
index e70223b19..000000000
--- a/src/template/base/top/supportApp/src/_APPNAME_.dbd
+++ /dev/null
@@ -1,6 +0,0 @@
-# provide definitions such as
-#include "xxxRecord.dbd"
-#device(xxx,CONSTANT,devXxxSoft,"SoftChannel")
-#driver(myDriver)
-#registrar(myRegistrar)
-#variable(myVariable)