diff --git a/motorExApp/NoAsyn/Makefile b/motorExApp/NoAsyn/Makefile
index b1e34203..12d01a87 100644
--- a/motorExApp/NoAsyn/Makefile
+++ b/motorExApp/NoAsyn/Makefile
@@ -7,12 +7,6 @@ include $(TOP)/configure/CONFIG
 
 DBD += NoMPF.dbd
 
-# !!WARNING!! If you copy this file to your
-# <ioctop> application, the following line
-# MUST BE REMOVED and a MOTOR entry must be
-# in your <ioctop>/config/RELEASE file.
-MOTOR_LIB = $(TOP)/lib/$(T_A)
-
 PROD_IOC_vxWorks = NoMPF
 
 NoMPF_SRCS += NoMPF_registerRecordDeviceDriver.cpp
@@ -22,26 +16,12 @@ NoMPF_SRCS_vxWorks += -nil-
 #The following adds support from base/src/vxWorks
 NoMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
-NoMPF_LIBS += recIoc
-NoMPF_LIBS += softDevIoc
-NoMPF_LIBS += testDevIoc
-NoMPF_LIBS += iocsh
-NoMPF_LIBS += miscIoc
-NoMPF_LIBS += rsrvIoc
-NoMPF_LIBS += dbtoolsIoc
-NoMPF_LIBS += asIoc
-NoMPF_LIBS += dbIoc
-NoMPF_LIBS += registryIoc
-NoMPF_LIBS += dbStaticIoc
-NoMPF_LIBS += ca
-NoMPF_LIBS += Com
-
 NoMPF_LIBS         += motor
 NoMPF_LIBS_vxWorks += oms
 NoMPF_LIBS         += softMotor
-motor_DIR          = $(MOTOR_LIB)
-oms_DIR            = $(MOTOR_LIB)
-softMotor_DIR      = $(MOTOR_LIB)
+NoMPF_LIBS         += MXmotor
+
+NoMPF_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 #===========================
 
diff --git a/motorExApp/NoMPF/Makefile b/motorExApp/NoMPF/Makefile
index b1e34203..12d01a87 100644
--- a/motorExApp/NoMPF/Makefile
+++ b/motorExApp/NoMPF/Makefile
@@ -7,12 +7,6 @@ include $(TOP)/configure/CONFIG
 
 DBD += NoMPF.dbd
 
-# !!WARNING!! If you copy this file to your
-# <ioctop> application, the following line
-# MUST BE REMOVED and a MOTOR entry must be
-# in your <ioctop>/config/RELEASE file.
-MOTOR_LIB = $(TOP)/lib/$(T_A)
-
 PROD_IOC_vxWorks = NoMPF
 
 NoMPF_SRCS += NoMPF_registerRecordDeviceDriver.cpp
@@ -22,26 +16,12 @@ NoMPF_SRCS_vxWorks += -nil-
 #The following adds support from base/src/vxWorks
 NoMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
-NoMPF_LIBS += recIoc
-NoMPF_LIBS += softDevIoc
-NoMPF_LIBS += testDevIoc
-NoMPF_LIBS += iocsh
-NoMPF_LIBS += miscIoc
-NoMPF_LIBS += rsrvIoc
-NoMPF_LIBS += dbtoolsIoc
-NoMPF_LIBS += asIoc
-NoMPF_LIBS += dbIoc
-NoMPF_LIBS += registryIoc
-NoMPF_LIBS += dbStaticIoc
-NoMPF_LIBS += ca
-NoMPF_LIBS += Com
-
 NoMPF_LIBS         += motor
 NoMPF_LIBS_vxWorks += oms
 NoMPF_LIBS         += softMotor
-motor_DIR          = $(MOTOR_LIB)
-oms_DIR            = $(MOTOR_LIB)
-softMotor_DIR      = $(MOTOR_LIB)
+NoMPF_LIBS         += MXmotor
+
+NoMPF_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 #===========================