diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile
index 0380f4bf..f27a59b1 100644
--- a/motorExApp/WithAsyn/Makefile
+++ b/motorExApp/WithAsyn/Makefile
@@ -1,3 +1,44 @@
-TOP=../..
-include $(TOP)/config/CONFIG_APP
-include $(TOP)/config/RULES_ARCHS
+# The WithMPF IOC can be configured either as a MPF client in a two CPU board
+# configuration, or as a single CPU board with both MPF client and server on
+# the same CPU board.  Remove either the "# !MPF-1-CPU! #" or the
+# "# !MPF-2-CPU! #" comment to configure.
+
+# Makefile
+TOP = ../..
+include $(TOP)/configure/CONFIG
+
+DBD += WithMPF.dbd
+DBD += WithMPFVx.dbd
+
+PROD_IOC_DEFAULT = WithMPF
+PROD_IOC_vxWorks = WithMPFVx
+
+WithMPF_SRCS   += WithMPF_registerRecordDeviceDriver.cpp
+WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp
+WithMPF_SRCS_DEFAULT += WithMPFMain.cpp
+
+# Support from EPICS base
+WithMPF_OBJS_vxWorks	+= $(EPICS_BASE_BIN)/vxComLibrary
+
+# Support from ipac
+WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
+WithMPFVx_OBJS_vxWorks	 += $(IPAC_BIN)/tyGSOctal
+
+WithMPF_LIBS		+= Acs
+WithMPF_LIBS		+= Ims
+WithMPF_LIBS		+= Newport
+WithMPF_LIBS		+= motorCOM_mpf
+WithMPF_LIBS		+= motor
+WithMPF_LIBS		+= mpfSerial mpfEpics mpf
+WithMPF_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
+
+WithMPFVx_LIBS		+= Acs
+WithMPFVx_LIBS		+= Ims
+WithMPFVx_LIBS		+= Newport
+WithMPFVx_LIBS		+= motorCOM_mpf
+WithMPFVx_LIBS		+= motor
+WithMPFVx_LIBS		+= mpfSerial mpfEpics mpf
+WithMPFVx_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
+
+include $(TOP)/configure/RULES
+
diff --git a/motorExApp/WithAsyn/WithAsynMain.c b/motorExApp/WithAsyn/WithAsynMain.c
new file mode 100644
index 00000000..1e964767
--- /dev/null
+++ b/motorExApp/WithAsyn/WithAsynMain.c
@@ -0,0 +1,21 @@
+/* WithMPFMain.c */
+/* Author:  Ron Sluiter */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "epicsThread.h"
+#include "iocsh.h"
+
+int main(int argc,char *argv[])
+{
+    if(argc>=2) {    
+        iocsh(argv[1]);
+        epicsThreadSleep(.2);
+    }
+    iocsh(NULL);
+    return(0);
+}
diff --git a/motorExApp/WithAsyn/WithAsynVxInclude.dbd b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
new file mode 100644
index 00000000..95035b2c
--- /dev/null
+++ b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
@@ -0,0 +1,7 @@
+include "base.dbd"
+include "motorRecord.dbd"
+include "mpfSerialVx.dbd"
+include "devAcsMotor.dbd"
+include "devImsMotor.dbd"
+include "devNewport.dbd"
+
diff --git a/motorExApp/WithAsyn/WithMPFMain.c b/motorExApp/WithAsyn/WithMPFMain.c
new file mode 100644
index 00000000..1e964767
--- /dev/null
+++ b/motorExApp/WithAsyn/WithMPFMain.c
@@ -0,0 +1,21 @@
+/* WithMPFMain.c */
+/* Author:  Ron Sluiter */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "epicsThread.h"
+#include "iocsh.h"
+
+int main(int argc,char *argv[])
+{
+    if(argc>=2) {    
+        iocsh(argv[1]);
+        epicsThreadSleep(.2);
+    }
+    iocsh(NULL);
+    return(0);
+}
diff --git a/motorExApp/WithAsyn/WithMPFVxInclude.dbd b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
new file mode 100644
index 00000000..95035b2c
--- /dev/null
+++ b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
@@ -0,0 +1,7 @@
+include "base.dbd"
+include "motorRecord.dbd"
+include "mpfSerialVx.dbd"
+include "devAcsMotor.dbd"
+include "devImsMotor.dbd"
+include "devNewport.dbd"
+
diff --git a/motorExApp/WithMPF/Makefile b/motorExApp/WithMPF/Makefile
index 0380f4bf..f27a59b1 100644
--- a/motorExApp/WithMPF/Makefile
+++ b/motorExApp/WithMPF/Makefile
@@ -1,3 +1,44 @@
-TOP=../..
-include $(TOP)/config/CONFIG_APP
-include $(TOP)/config/RULES_ARCHS
+# The WithMPF IOC can be configured either as a MPF client in a two CPU board
+# configuration, or as a single CPU board with both MPF client and server on
+# the same CPU board.  Remove either the "# !MPF-1-CPU! #" or the
+# "# !MPF-2-CPU! #" comment to configure.
+
+# Makefile
+TOP = ../..
+include $(TOP)/configure/CONFIG
+
+DBD += WithMPF.dbd
+DBD += WithMPFVx.dbd
+
+PROD_IOC_DEFAULT = WithMPF
+PROD_IOC_vxWorks = WithMPFVx
+
+WithMPF_SRCS   += WithMPF_registerRecordDeviceDriver.cpp
+WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp
+WithMPF_SRCS_DEFAULT += WithMPFMain.cpp
+
+# Support from EPICS base
+WithMPF_OBJS_vxWorks	+= $(EPICS_BASE_BIN)/vxComLibrary
+
+# Support from ipac
+WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
+WithMPFVx_OBJS_vxWorks	 += $(IPAC_BIN)/tyGSOctal
+
+WithMPF_LIBS		+= Acs
+WithMPF_LIBS		+= Ims
+WithMPF_LIBS		+= Newport
+WithMPF_LIBS		+= motorCOM_mpf
+WithMPF_LIBS		+= motor
+WithMPF_LIBS		+= mpfSerial mpfEpics mpf
+WithMPF_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
+
+WithMPFVx_LIBS		+= Acs
+WithMPFVx_LIBS		+= Ims
+WithMPFVx_LIBS		+= Newport
+WithMPFVx_LIBS		+= motorCOM_mpf
+WithMPFVx_LIBS		+= motor
+WithMPFVx_LIBS		+= mpfSerial mpfEpics mpf
+WithMPFVx_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
+
+include $(TOP)/configure/RULES
+
diff --git a/motorExApp/WithMPF/WithMPFMain.c b/motorExApp/WithMPF/WithMPFMain.c
new file mode 100644
index 00000000..1e964767
--- /dev/null
+++ b/motorExApp/WithMPF/WithMPFMain.c
@@ -0,0 +1,21 @@
+/* WithMPFMain.c */
+/* Author:  Ron Sluiter */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "epicsThread.h"
+#include "iocsh.h"
+
+int main(int argc,char *argv[])
+{
+    if(argc>=2) {    
+        iocsh(argv[1]);
+        epicsThreadSleep(.2);
+    }
+    iocsh(NULL);
+    return(0);
+}
diff --git a/motorExApp/WithMPF/WithMPFVxInclude.dbd b/motorExApp/WithMPF/WithMPFVxInclude.dbd
new file mode 100644
index 00000000..95035b2c
--- /dev/null
+++ b/motorExApp/WithMPF/WithMPFVxInclude.dbd
@@ -0,0 +1,7 @@
+include "base.dbd"
+include "motorRecord.dbd"
+include "mpfSerialVx.dbd"
+include "devAcsMotor.dbd"
+include "devImsMotor.dbd"
+include "devNewport.dbd"
+