diff --git a/servers/slapd/back-bdb/error.c b/servers/slapd/back-bdb/error.c
index 9e126da605..00f528c97d 100644
--- a/servers/slapd/back-bdb/error.c
+++ b/servers/slapd/back-bdb/error.c
@@ -15,5 +15,5 @@
 
 void bdb_errcall( const char *pfx, char * msg )
 {
-	Debug( LDAP_DEBUG_ANY, "bdb(%s): %s", pfx, msg, 0 );
+	Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg, 0 );
 }
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index eec64e86e2..ac46b03a80 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -115,11 +115,7 @@ bdb_db_open( BackendDB *be )
 	}
 
 	flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | 
-		DB_CREATE | DB_RECOVER;
-
-#ifndef NO_THREADS
-	flags |= DB_THREAD;
-#endif
+		DB_THREAD | DB_CREATE | DB_RECOVER;
 
 	bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0] );
 	bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );