diff --git a/CHANGES b/CHANGES
index 6a8298c26d..eb7c5816b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 OpenLDAP 2.0 Change Log
 
+OpenLDAP 2.0.17 Engineering
+	Fixed ldbm BerkeleyDB2 compat bug (ITS#1390)
+
 OpenLDAP 2.0.16 Release
 	Fixed ITS indexing bug (ITS#1349)
 	Fixed slapd/slurpd maxargs bug (ITS#1343)
diff --git a/build/version b/build/version
index 0bef167b96..eb8a74378a 100644
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.16-Release
+2.0.17-Engineering
diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index 03112e37f6..e6fdfa6e14 100644
--- a/libraries/libldbm/ldbm.c
+++ b/libraries/libldbm/ldbm.c
@@ -165,8 +165,7 @@ int ldbm_initialize( const char* home )
 	if ( err ) {
 #ifdef LDAP_SYSLOG
 		syslog( LOG_INFO, "ldbm_initialize(): "
-			"FATAL error in db_appinit() : %s (%d)\n",
-			db_strerror( err ), err );
+			"FATAL error (%d) in db_appinit()\n", err );
 #endif
 	 	return( 1 );
 	}