diff --git a/src/ioc/db/Makefile b/src/ioc/db/Makefile
index 4db814b4a..227786ec3 100644
--- a/src/ioc/db/Makefile
+++ b/src/ioc/db/Makefile
@@ -55,7 +55,7 @@ menuGlobal_DBD += menuSimm.dbd
 DBDINC += $(basename $(menuGlobal_DBD))
 DBDINC += dbCommon
 
-DBD_INSTALLS += filters.dbd
+DBD_INSTALLS += ../db/filters/filters.dbd
 
 
 dbCore_SRCS += dbLock.c
@@ -88,6 +88,8 @@ dbCore_SRCS += dbIocRegister.c
 dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c
 
+SRC_DIRS += $(IOCDIR)/db/filters
+
 dbCore_SRCS += ts.c
 dbCore_SRCS += dbnd.c
 dbCore_SRCS += arr.c
diff --git a/src/ioc/db/filters/test/Makefile b/src/ioc/db/filters/test/Makefile
index 3ce50d9f2..ef8628dc5 100644
--- a/src/ioc/db/filters/test/Makefile
+++ b/src/ioc/db/filters/test/Makefile
@@ -6,11 +6,11 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../../../..
+TOP=../../../../..
 
 include $(TOP)/configure/CONFIG
 
-PROD_LIBS += dbIoc miscIoc registryIoc ca Com
+PROD_LIBS += dbCore ca Com
 
 TESTPROD_HOST += tsTest
 tsTest_SRCS += tsTest.c
diff --git a/src/ioc/db/test/Makefile b/src/ioc/db/test/Makefile
index 04e670d75..43ea497ed 100644
--- a/src/ioc/db/test/Makefile
+++ b/src/ioc/db/test/Makefile
@@ -22,25 +22,25 @@ TESTSPEC_vxWorks = callbackTest.munch; callbackTest
 
 TESTPROD_HOST += dbChannelTest
 dbChannelTest_SRCS += dbChannelTest.c
-dbChannelTest_LIBS += dbIoc dbStaticHost
+dbChannelTest_LIBS += dbCore
 OBJS_IOC_vxWorks += dbChannelTest
 TESTS += dbChannelTest
 
 TESTPROD_HOST += chfPluginTest
 chfPluginTest_SRCS += chfPluginTest.c
-chfPluginTest_LIBS += dbIoc dbStaticHost
+chfPluginTest_LIBS += dbCore
 OBJS_IOC_vxWorks += chfPluginTest
 TESTS += chfPluginTest
 
 TESTPROD_HOST += arrShorthandTest
 arrShorthandTest_SRCS += arrShorthandTest.c
-arrShorthandTest_LIBS += dbIoc dbStaticHost
+arrShorthandTest_LIBS += dbCore
 OBJS_IOC_vxWorks += arrShorthandTest
 TESTS += arrShorthandTest
 
 TESTPROD_HOST += dbStateTest
 dbStateTest_SRCS += dbStateTest.c
-dbStateTest_LIBS += dbIoc dbStaticHost
+dbStateTest_LIBS += dbCore
 OBJS_IOC_vxWorks += dbStateTest
 TESTS += dbStateTest