diff --git a/Makefile b/Makefile
index 08541f1c0..87aa3fe50 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,10 @@
 TOP = .
 include $(TOP)/configure/CONFIG
 
-DIRS += config config/tools configure src
+ifeq ($(strip $(COMPAT_313)),YES)
+DIRS += config config/tools
+endif
+DIRS += configure src
 
 include $(TOP)/configure/RULES_TOP
 
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index d57324fbc..1631ff065 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -130,6 +130,14 @@ HOST_WARN=YES
 #	must be either YES or NO
 CROSS_WARN=YES
 
+#  Create and/or install files for R3.13 ioc application and extension builds?
+#  must be either YES or NO
+#
+#  NOTE: Set to YES only if you have existing R3.13 ioc applications
+#  or extensions that will be built with this base
+#
+COMPAT_313=NO
+
 #  Installation directory
 #Note: INSTALL_LOCATION definition moved to configure/RELEASE file
 
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index a844f206e..a85a5c2f7 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -16,6 +16,21 @@
 <h2>Changes since 3.14.4</h2>
 </center>
 
+
+<h4>R3.13 compatability files</h4>
+
+<p>R3.13 compatability files will no longer be generated as
+default during the build. There is a new macro, COMPAT_313,
+in the configure/CONFIG_SITE file which must be set to
+YES for R3.13 compatability files to be created and installed.
+You will need to set COMPAT_313 to YES if you want R3.13 ioc
+applications or R3.13 extensions built with this R3.14 base.
+</p>
+
+<p>The COMPAT_313 macro is set to NO in the CONFIG_SITE distribution
+file.
+</p>
+
 <h4>Stringin record time-stamp soft device support</h4>
 Add simple device support for converting time to nicely-formatted string using
 INP field as epicsTimeToStrftime format string:
diff --git a/src/as/Makefile b/src/as/Makefile
index 20d771645..491fa484c 100644
--- a/src/as/Makefile
+++ b/src/as/Makefile
@@ -35,8 +35,10 @@ ascheck_SRCS = ascheck.c
 PROD_LIBS = asHost dbStaticHost Com
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=asIoc
 OBJLIB_SRCS += $(LIB_SRCS) $(asIoc_SRCS)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/ca/Makefile b/src/ca/Makefile
index 64a216382..75e9d1787 100644
--- a/src/ca/Makefile
+++ b/src/ca/Makefile
@@ -76,8 +76,10 @@ LIBRARY=ca
 ca_RCS_WIN32 = ca.rc
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=ca
 OBJLIB_SRCS = $(LIBSRCS)
+endif
 
 ca_LIBS = Com
 
diff --git a/src/db/Makefile b/src/db/Makefile
index 8f67b0379..fadf9ee4a 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -80,8 +80,10 @@ dbIoc_LIBS = dbStaticIoc ca Com
 dbIoc_RCS_WIN32 = dbIoc.rc
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=dbIoc
 OBJLIB_SRCS = $(LIBSRCS)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile
index a737a2e69..4151d41b7 100644
--- a/src/dbStatic/Makefile
+++ b/src/dbStatic/Makefile
@@ -34,8 +34,10 @@ LIBRARY_HOST += dbStaticHost
 LIBRARY_IOC += dbStaticIoc
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=dbStaticIoc
 OBJLIB_SRCS = $(LIBSRCS) $(dbStaticIoc_SRCS)
+endif
 
 dbStaticHost_LIBS = Com
 dbStaticIoc_LIBS = Com
diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile
index 805e0ce42..f2cbc08c7 100644
--- a/src/dbtools/Makefile
+++ b/src/dbtools/Makefile
@@ -27,8 +27,10 @@ dbtoolsIoc_RCS_WIN32 = dbtoolsIoc.rc
 HTMLS += dbLoadTemplate.html
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=dbtoolsIoc
 OBJLIB_SRCS = $(LIBSRCS)
+endif
 
 include $(TOP)/configure/RULES
  
diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile
index 5f87eae4a..973a490da 100644
--- a/src/dev/softDev/Makefile
+++ b/src/dev/softDev/Makefile
@@ -54,7 +54,9 @@ softDevIoc_LIBS += recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
 softDevIoc_RCS_WIN32 = softDevIoc.rc
 
 # For R3.13 compatability
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJS_vxWorks = $(LIBSRCS:%.c=%)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/dev/testDev/Makefile b/src/dev/testDev/Makefile
index bd6a834bd..92d0c42d0 100644
--- a/src/dev/testDev/Makefile
+++ b/src/dev/testDev/Makefile
@@ -32,6 +32,8 @@ testDevIoc_LIBS += recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
 testDevIoc_RCS_WIN32 = testDevIoc.rc
 
 # For R3.13 compatability
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJS_vxWorks = $(LIBSRCS:%.c=%)
+endif
 
 include $(TOP)/configure/RULES
diff --git a/src/iocsh/Makefile b/src/iocsh/Makefile
index 5a19bd388..27b8fbdff 100644
--- a/src/iocsh/Makefile
+++ b/src/iocsh/Makefile
@@ -58,8 +58,10 @@ iocsh_LIBS  = miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc Com
 iocsh_RCS_WIN32 = iocsh.rc
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=iocsh
 OBJLIB_SRCS = $(LIBSRCS)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/libCom/Makefile b/src/libCom/Makefile
index 0f2413fcf..2a3b1b91a 100644
--- a/src/libCom/Makefile
+++ b/src/libCom/Makefile
@@ -255,8 +255,10 @@ Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 Com_RCS_WIN32 = Com.rc
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=Com
 OBJLIB_SRCS = $(SRCS)
+endif
 
 #   libs needed for PROD and TESTPRODUCT
 PROD_LIBS = Com
diff --git a/src/misc/Makefile b/src/misc/Makefile
index 41104fbe5..0eb546395 100644
--- a/src/misc/Makefile
+++ b/src/misc/Makefile
@@ -26,8 +26,10 @@ miscIoc_RCS_WIN32 = miscIoc.rc
 miscIoc_LIBS  = rsrvIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=miscIoc
 OBJLIB_SRCS = $(LIBSRCS)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/rec/Makefile b/src/rec/Makefile
index f46f8db9a..5a442c42d 100644
--- a/src/rec/Makefile
+++ b/src/rec/Makefile
@@ -86,7 +86,9 @@ recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com
 recIoc_RCS_WIN32 = recIoc.rc
 
 # For R3.13 compatability
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJS_vxWorks = $(LIBSRCS:%.c=%)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/registry/Makefile b/src/registry/Makefile
index 2c10af854..bd90b26b9 100644
--- a/src/registry/Makefile
+++ b/src/registry/Makefile
@@ -40,8 +40,10 @@ registryIoc_LIBS  = Com
 
 registryIoc_RCS_WIN32 = registryIoc.rc
 
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks = registryIoc
 OBJLIB_SRCS = $(LIBSRCS)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile
index cc9dde419..771bcc6b2 100644
--- a/src/rsrv/Makefile
+++ b/src/rsrv/Makefile
@@ -29,7 +29,9 @@ rsrvIoc_SYS_LIBS_WIN32 := ws2_32
 rsrvIoc_RCS_WIN32 = rsrvIoc.rc
 
 # For R3.13 compatibility only
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=rsrvIoc
 OBJLIB_SRCS = $(LIBSRCS)
+endif
 
 include $(TOP)/configure/RULES
diff --git a/src/vxWorks/Makefile b/src/vxWorks/Makefile
index 1c8666933..13bc5a330 100644
--- a/src/vxWorks/Makefile
+++ b/src/vxWorks/Makefile
@@ -24,9 +24,11 @@ iocCore_OBJS += $(INSTALL_BIN)/iocshLibrary.o
 iocCore_OBJS += $(INSTALL_BIN)/vxComLibrary.o
 iocCore_SRCS += registerRecordDeviceDriver.c
 
+ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks = iocCore
 OBJLIB_OBJS += $(iocCore_OBJS)
 OBJLIB_SRCS += registerRecordDeviceDriver.c
+endif
 
 include $(TOP)/configure/RULES