diff --git a/device-mapper.changes b/device-mapper.changes
index 1430ff9..9251457 100644
--- a/device-mapper.changes
+++ b/device-mapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 17 08:21:27 UTC 2017 - zren@suse.com
+
+- Add lvmlockd-related configuration items in lvm.conf, fate#323203
+
 -------------------------------------------------------------------
 Tue May 16 07:45:25 UTC 2017 - zren@suse.com
 
diff --git a/lvm.conf b/lvm.conf
index d88fe23..126a79a 100644
--- a/lvm.conf
+++ b/lvm.conf
@@ -688,6 +688,30 @@ global {
 	# If use_lvmetad set to 1, please make sure lvm2-lvmetad.socket is started
 	use_lvmetad = 1
 
+	# Configuration option global/use_lvmlockd.
+	# Use lvmlockd for locking among hosts using LVM on shared storage.
+	# Applicable only if LVM is compiled with lockd support in which
+	# case there is also lvmlockd(8) man page available for more
+	# information.
+	use_lvmlockd = 0
+
+	# Configuration option global/lvmlockd_lock_retries.
+	# Retry lvmlockd lock requests this many times.
+	# Applicable only if LVM is compiled with lockd support
+	# This configuration option has an automatic default value.
+	# lvmlockd_lock_retries = 3
+
+	# Configuration option global/sanlock_lv_extend.
+	# Size in MiB to extend the internal LV holding sanlock locks.
+	# The internal LV holds locks for each LV in the VG, and after enough
+	# LVs have been created, the internal LV needs to be extended. lvcreate
+	# will automatically extend the internal LV when needed by the amount
+	# specified here. Setting this to 0 disables the automatic extension
+	# and can cause lvcreate to fail. Applicable only if LVM is compiled
+	# with lockd support
+	# This configuration option has an automatic default value.
+	# sanlock_lv_extend = 256
+
 	# Full path of the utility called to check that a thin metadata device
 	# is in a state that allows it to be used.
 	# Each time a thin pool needs to be activated or after it is deactivated
diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes
index 1430ff9..9251457 100644
--- a/lvm2-clvm.changes
+++ b/lvm2-clvm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 17 08:21:27 UTC 2017 - zren@suse.com
+
+- Add lvmlockd-related configuration items in lvm.conf, fate#323203
+
 -------------------------------------------------------------------
 Tue May 16 07:45:25 UTC 2017 - zren@suse.com
 
diff --git a/lvm2.changes b/lvm2.changes
index 1430ff9..9251457 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 17 08:21:27 UTC 2017 - zren@suse.com
+
+- Add lvmlockd-related configuration items in lvm.conf, fate#323203
+
 -------------------------------------------------------------------
 Tue May 16 07:45:25 UTC 2017 - zren@suse.com