diff --git a/configure/CONFIG_APP_INCLUDE b/configure/CONFIG_APP_INCLUDE
index 3951ed282..6b6786169 100644
--- a/configure/CONFIG_APP_INCLUDE
+++ b/configure/CONFIG_APP_INCLUDE
@@ -14,8 +14,8 @@ define  RELEASE_FLAGS_template
   SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
   RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
   RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
-  RELEASE_DBDFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/dbd))
-  RELEASE_DBFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/db))
+  RELEASE_DBD_DIRS += $$(wildcard $$(strip $$($(1)))/dbd)
+  RELEASE_DB_DIRS += $$(wildcard $$(strip $$($(1)))/db)
   RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl)
 endef
 $(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) ))
diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION
index f732d4587..f3063c3b6 100644
--- a/configure/CONFIG_BASE_VERSION
+++ b/configure/CONFIG_BASE_VERSION
@@ -1,5 +1,5 @@
 #*************************************************************************
-# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
@@ -7,7 +7,7 @@
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-#  Revision-Id: jba@aps.anl.gov-20111212200932-ms3d0pzp9t1uojxe
+#  Revision-Id: anj@aps.anl.gov-20131121000228-ktews1dyr7n1r06b
 #
 #  EPICS Version information
 #
@@ -30,11 +30,11 @@ EPICS_MODIFICATION = 12
 
 # EPICS_PATCH_LEVEL must be a number  (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 2
+EPICS_PATCH_LEVEL = 4
 
 # This will end in -DEV between official releases
 #EPICS_DEV_SNAPSHOT=-DEV
-#EPICS_DEV_SNAPSHOT=-pre1
+EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV
@@ -42,7 +42,7 @@ EPICS_PATCH_LEVEL = 2
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-EPICS_DEV_SNAPSHOT=
+#EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 
@@ -58,7 +58,7 @@ EPICS_SHORT_VERSION=$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EP
 EPICS_VERSION_NUMBER=$(EPICS_SHORT_VERSION)$(EPICS_DEV_SNAPSHOT)$(EPICS_SITE_VSTRING)
 EPICS_VERSION_STRING="EPICS Version $(EPICS_VERSION_NUMBER)"
 
-COMMIT_DATE="\$Date: 2011/12/14 08:56:55 $"
+COMMIT_DATE="\$Date: 2013/11/27 09:26:05 $"
 
 # Provide these in case anyone is still using the old names
 EPICS_CVS_SNAPSHOT=$(EPICS_DEV_SNAPSHOT)
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 412edc212..bdb5aa650 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-#  Revision-Id: anj@aps.anl.gov-20111202201024-6naufg256gbustg2
+#  Revision-Id: anj@aps.anl.gov-20130710191331-94pikhnfm7gqxfy3
 #
 #  CONFIG_COMMON
 #
@@ -76,9 +76,12 @@ INSTALL_DB                  = $(INSTALL_LOCATION)/db
 INSTALL_CONFIG              = $(INSTALL_LOCATION)/configure
 INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 
-#Directory for OS independant build created files
+# Directory for OS independant build created files
 COMMON_DIR = ../O.Common
 
+# IOC's absolute path to $(TOP), may be overridden inside the application
+IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
+
 #-------------------------------------------------------
 # Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :