diff --git a/ldb.changes b/ldb.changes
index 0ada50a..b60aaa8 100644
--- a/ldb.changes
+++ b/ldb.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep  7 21:55:16 UTC 2015 - lmuelle@suse.com
+
+- Move the ldb-cmdline library to the ldb-tools package as the packaged
+  binaries depend on it.
+
+-------------------------------------------------------------------
+Mon Sep  7 17:06:26 UTC 2015 - lmuelle@suse.com
+
+- Update the Samba Library Distribution Key file 'ldb.keyring'.
+
 -------------------------------------------------------------------
 Wed Jul 22 07:37:48 UTC 2015 - lmuelle@suse.com
 
diff --git a/ldb.keyring b/ldb.keyring
index 6b769d6..0404526 100644
--- a/ldb.keyring
+++ b/ldb.keyring
@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
 mQENBE0uBhsBCADIjamou8B7vf0Gnvdb8ZhJ708kXnoeGH161xffaYJg40rXhyyl
 OHlc4ZLVc4OyFr+tWREgNDyBkeS5TTsJ3ul/cBMbBjpn2LOO41X1fenhlvWFkhuC
@@ -33,24 +33,38 @@ BbhHJAAKCRBHk5FhEwhAJXAKB/4k71NcxA/xjJFMxh5HUjeLPi1ll7EYWVz9oOP6
 4kLYkzSIYwoqCxr6aMC6Q4QvJT0SCLM7hEZ6j+wI5PlDKSPp0DBIcnVjDDTjpjbq
 9LYHEstZOOJ30Yw2wJVe3kvLlUAMTV1ovNgUE04xiR+mjvwUYTZpgxrllwwz8k+Q
 Q3Ly1VX1z4N/mfMFSh+wiyvcZp37lhjHvHwATNDgcN8NUqREx5xPooqKk53YhycX
-yOnLRxkdG594bxeq3rRCqwpp8VszVZ5rUK6E+zeW63UCsR78uQENBE0uBhsBCAC/
-r9eB7oCPNE1dYkzaWrt5LrA8aoZL0sn9Uu871h63L5ZbCA8nnGQMPRY1J92yS2AX
-wXagn2Q+kB9lyB0pX5xYnxIrIX4eAvPDSiPf8FlT/a534AD1kXSNaKAu+yX86Vlm
-toYeWT4JPFqxAdKbOkwKLoM+pj9hFKQdzaiQBL9ShNUkwQ62CKGYF+AJMcomn+zc
-tyflnYMNybJLhux3hAvqymcagq2RwMqBkjCU1U5eGDzRfBn37i/Em6pNNeRd4G5F
-7mP9oi6QBC0E3jJQs6mZ94GfSAHSZJqdDHG30i+i0iyNDNHLBPdYOGxuNkz4ACMD
-yx7KdUorriW7hO+XIdytABEBAAGJASUEGAECAA8CGwwFAk8ae0MFCQPNqKIACgkQ
-R5ORYRMIQCWEXAf9Hhk+M1l8bSdx0m5qgYRei3kl+iSkSoF4A/xBNL2aXlmEpmBw
-Ot6YT8zGhHWBOaXKTykU2qwwDym1hxqmwJcXTVQabbllnC7ptkT2n7pvJoEh/vgG
-od3zsGoG3GtAxpMDtU+SHYYVq1cT99Tp/gI5fVW84dD/tiPPo6NMg84ynpwzrY0x
-tfnGQhs0JByiwMoLnGlikR+h62Q7SO36gYYuHNf3k+D/r4WctwgoiP/mv+ewdxoD
-aF9M1CzLRdY1rDqKbMWiznpxI1cHGaeP45fx1If2RnpdJ6W+UYNGzJ48j7vS5ph8
-1EGe9M7unpQLMbR2d7MggFfg9wqFyaWQI41QT4kBJQQYAQIADwIbDAUCUQUaOgUJ
-BbhHmwAKCRBHk5FhEwhAJQ8IB/9pJowNfed0qU2ddBG68X0EN3e92+3pmzTMB51g
-sDVTbRibB23/2TRuwSptefxSSbozCX/UyEWFK+TwYmX8eE3Nas+njre/CnvX/1wM
-twYOdSPF9vrtVMZrkj4jTV9RGRXRR1nReNB1A0BTFsfLKr5Wpznj0LEjNmoz7omb
-3gQsuv4zEdq5mPjEAXbxkSGAM8UbcxoMM/A7EbnkL8sLzdWc1JC+z9pOSsHmhqhc
-3IvCRnl9M22dnl+8FJjDwnUdBY1l1689kL6ryyebgnrVqO8+M+85h7XoB5O0pgIm
-be5AIF8rela8HSphYyhWAmGnJejZpdJQUwfDK9bXhAjyBFeq
-=Tw7M
+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
+T5Q=
+=9mzF
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/ldb.spec b/ldb.spec
index a223164..8b4c5ab 100644
--- a/ldb.spec
+++ b/ldb.spec
@@ -179,7 +179,6 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_includedir}/ldb_version.h
 %{_libdir}/libldb.so
 %dir %{_libdir}/ldb
-%{_libdir}/ldb/libldb-cmdline.so
 %{_libdir}/pkgconfig/ldb.pc
 
 %files -n ldb-tools
@@ -190,6 +189,7 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_bindir}/ldbmodify
 %{_bindir}/ldbrename
 %{_bindir}/ldbsearch
+%{_libdir}/ldb/libldb-cmdline.so
 %{_mandir}/man1/ldbadd.1.gz
 %{_mandir}/man1/ldbdel.1.gz
 %{_mandir}/man1/ldbedit.1.gz