diff --git a/configure/RULES.Db b/configure/RULES.Db
index e6e53764a..94adf5205 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -24,6 +24,7 @@ vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
 DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
 DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. $(GENERIC_SRC_INCLUDES)
+DBFLAGS += -I$(COMMON_DIR)
 
 #####################################################  Targets
 
@@ -60,7 +61,7 @@ TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(pats
           $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
           $(TEMPLATE1)))))))))))
 TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) $(TEMPLATE3) ../template))
+TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
 
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
@@ -80,6 +81,8 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(COMMON_DBDS) \
 DBDDEPENDS_FLAGS = $(filter .%,$(subst -I,,$(filter-out -S%,$(DBDFLAGS))))
 DBDDEPENDS_CMD = -$(MKMF) -m $@$(DEP) $(DBDDEPENDS_FLAGS) $@ $<
 
+MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl
+
 ##################################################### 
 
 ifndef T_A
@@ -136,15 +139,6 @@ clean::
 
 ##################################################### "Foreign" templates
 
-TEMPLATE_LINKS	= $(filter-out $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-TEMPLATE_FILES	= $(filter     $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-COMMON_TEMPLATES=$(addprefix $(COMMON_DIR)/,$(notdir $(TEMPLATE_LINKS)))
-
-ifneq '$(TEMPLATE_LINKS)' ''
-build: $(notdir $(TEMPLATE_LINKS))
-endif
-build: $(TEMPLATE_FILES)
-
 $(COMMON_TEMPLATES): $(COMMON_DIR)/%.template: 
 ifndef WIN32
 	@$(RM) $(notdir $(TEMPLATE_LINKS))
@@ -254,20 +248,18 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 	@$(REPLACEVAR) < $@.VAR > $@
 	@$(RM) $@.VAR
 
-# dbst based database optimization
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
-	@$(DBDDEPENDS_CMD)
+	@$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
 	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
-	@echo "$@:$($*_DEPENDS)" >> $@$(DEP)
-	@echo "Inflating database from $<"
+	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
 	$(MV) msi.tmp $@
 
 $(COMMON_DIR)/%.db$(RAW): %.template
 	@$(RM) $@$(DEP)
-	@$(DBDDEPENDS_CMD)
+	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
 	@echo "Inflating database from $<"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS)  $< > msi.tmp