diff --git a/motorApp/Db/Makefile b/motorApp/Db/Makefile
index a25d43a8..0f40b164 100644
--- a/motorApp/Db/Makefile
+++ b/motorApp/Db/Makefile
@@ -15,30 +15,11 @@ include $(TOP)/configure/CONFIG
 #----------------------------------------------------
 # Create and install (or just install)
 # databases, templates, substitutions like this
-DB += asyn_auto_power.db
-DB += asyn_motor.db
-DB += asyn_motor_positions.req
-DB += asyn_motor_settings.req
-DB += basic_asyn_motor.db
-DB += basic_motor.db
-DB += basic_motor_settings.req
-DB += coordTrans2D.db
-DB += motor.db
-DB += motor_positions.req
-DB += motor_settings.req
-DB += motorUtil.db
-DB += profileMoveAxis.template
-DB += profileMoveAxis_settings.req
-DB += profileMoveController.template
-DB += profileMoveController_settings.req
-DB += pseudoMotor.db
-DB += pseudoMotor_settings.req
-DB += SoftMotorEx.db
-DB += softMotorTest.db
-DB += sumDiff2D.db
-DB += trajectoryScan.db
-DB += trajectoryScan_settings.req
-DB += TransPos.db
+DB += $(patsubst ../%, %, $(wildcard ../*.template))
+DB += $(patsubst ../%, %, $(wildcard ../*.db))
+DB += $(patsubst ../%, %, $(wildcard ../*.vdb))
+
+REQ += $(patsubst ../%, %, $(wildcard ../*.req))
 
 #----------------------------------------------------
 # Declare template files which do not show up in DB