diff --git a/configure/CONFIG_DATABASE_VERSION b/configure/CONFIG_DATABASE_VERSION
index 21ac836b0..93a87a0a3 100644
--- a/configure/CONFIG_DATABASE_VERSION
+++ b/configure/CONFIG_DATABASE_VERSION
@@ -1,8 +1,8 @@
 # Version number for the database APIs and shared library
 
 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 17
-EPICS_DATABASE_MAINTENANCE_VERSION = 6
+EPICS_DATABASE_MINOR_VERSION = 18
+EPICS_DATABASE_MAINTENANCE_VERSION = 0
 
 # Development flag, set to zero for release versions
 
diff --git a/modules/database/src/ioc/Makefile b/modules/database/src/ioc/Makefile
index 70b1b5558..c19b55098 100644
--- a/modules/database/src/ioc/Makefile
+++ b/modules/database/src/ioc/Makefile
@@ -11,9 +11,10 @@ TOP = ../../../..
 
 include $(TOP)/configure/CONFIG
 
-USR_CPPFLAGS += -DUSE_TYPED_RSET
+USR_CPPFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET
 
-SHRLIB_VERSION = 3.17.0
+# Shared library ABI version.
+SHRLIB_VERSION = $(EPICS_DATABASE_MAJOR_VERSION).$(EPICS_DATABASE_MINOR_VERSION).$(EPICS_DATABASE_MAINTENANCE_VERSION)
 
 LIBRARY_IOC += dbCore
 dbCore_LIBS += ca Com
diff --git a/modules/database/src/std/Makefile b/modules/database/src/std/Makefile
index 3aee75078..d323bc077 100644
--- a/modules/database/src/std/Makefile
+++ b/modules/database/src/std/Makefile
@@ -13,7 +13,8 @@ include $(TOP)/configure/CONFIG
 
 USR_CPPFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET
 
-SHRLIB_VERSION = 3.17.0
+# Shared library ABI version.
+SHRLIB_VERSION = $(EPICS_DATABASE_MAJOR_VERSION).$(EPICS_DATABASE_MINOR_VERSION).$(EPICS_DATABASE_MAINTENANCE_VERSION)
 
 LIBRARY_IOC += dbRecStd
 dbRecStd_LIBS = dbCore ca Com