diff --git a/CHANGES b/CHANGES
index d99102bbbb..29f23a1afe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2041.	[bug]		"configure --with-dlz-bdb=yes" produced a bad
+			set of libraries to be linked. [RT #16129]
+
 2040.	[placeholder]	rt16022
 
 2039.	[func]		Check that all buffers passed to the socket code
diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
index af463eb21c..0e4b2e580b 100644
--- a/contrib/dlz/config.dlz.in
+++ b/contrib/dlz/config.dlz.in
@@ -237,6 +237,8 @@ case "$use_dlz_bdb" in
 					if test "$dd" != "/usr"
 					then
 						dlz_bdb_libs="-L${dd}/lib "
+					else
+						dlz_bdb_libs=""
 					fi
 					dlz_bdb_libs="${dlz_bdb_libs}-l${d}"
 					break