diff --git a/samba.changes b/samba.changes
index a64abc6..e1ee9af 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr  3 14:01:25 UTC 2017 - ddiss@suse.com
+
+- Enable librados CTDB lock helper for samba-ceph package; (fate#321622).
+
 -------------------------------------------------------------------
 Thu Mar 30 17:18:54 UTC 2017 - dmulder@suse.com
 
@@ -17,7 +22,7 @@ Wed Mar 22 13:15:12 UTC 2017 - jmcdonough@suse.com
   + new primary group support for idmap_ad
   + idmap_hash deprecated
   + mvxattr added to recursively rename extended attributes
-  
+
 -------------------------------------------------------------------
 Wed Mar 15 11:50:50 UTC 2017 - aaptel@suse.com
 
diff --git a/samba.spec b/samba.spec
index ee71455..800e645 100644
--- a/samba.spec
+++ b/samba.spec
@@ -23,7 +23,7 @@
 %endif
 %if 0%{?suse_version} > 1320
 %ifarch x86_64
-%define         build_vfs_ceph 1
+%define         build_ceph 1
 %endif
 %endif
 
@@ -126,8 +126,9 @@ BuildRequires:  systemd-devel
 %if 0%{?build_ctdb_pmda}
 BuildRequires:  libpcp-devel
 %endif
-%if 0%{?build_vfs_ceph}
+%if 0%{?build_ceph}
 BuildRequires:  libcephfs-devel
+BuildRequires:  librados-devel
 %endif
 %define	samba_ver 4.6.1
 %define	samba_ver_suffix %nil
@@ -1036,15 +1037,17 @@ develop programs which make use of the wbclient programming interface.
 Source Timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-%if 0%{?build_vfs_ceph}
+%if 0%{?build_ceph}
 %package ceph
-Summary:        Ceph VFS Module for Samba
+Summary:        Ceph specific add-ons for Samba
 License:        GPL-3.0+
 Group:          Productivity/Networking/Samba
 Requires:       samba = %{version}
 
 %description ceph
-The Ceph VFS module for Samba allows shares to be backed by the Ceph distributed file system.
+The Ceph VFS module for Samba allows shares to be backed by the Ceph
+distributed file system. A Ceph CTDB lock helper binary is included so
+that RADOS locks can be used for CTDB split-brain avoidance.
 %endif
 
 
@@ -1131,6 +1134,9 @@ CONFIGURE_OPTIONS="\
 %endif
 	--enable-fhs \
 	--with-cluster-support \
+%if 0%{?build_ceph}
+	--enable-ceph-reclock \
+%endif
 	--with-pam \
 	--with-pammodulesdir=%{_lib}/security \
 	--with-piddir=%{PIDDIR} \
@@ -1399,7 +1405,7 @@ done
 for file in %{buildroot}%{_mandir}/man8/vfs_*; do
 	case "${file#%{buildroot}}" in
 		%{_mandir}/man8/vfs_ceph.8)
-			%if 0%{?build_vfs_ceph} == 0
+			%if 0%{?build_ceph} == 0
 			rm ${file}
 			%endif
 			continue
@@ -2463,11 +2469,13 @@ fi
 %{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 
-%if 0%{?build_vfs_ceph}
+%if 0%{?build_ceph}
 %files ceph
 %defattr(-,root,root)
 %{_mandir}/man8/vfs_ceph.8.*
 %{_libdir}/samba/vfs/ceph.so
+%{_mandir}/man7/ctdb_mutex_ceph_rados_helper.7.*
+%{_libdir}/ctdb/ctdb_mutex_ceph_rados_helper
 %endif
 
 %changelog