diff --git a/lvm2.changes b/lvm2.changes
index 7dee22c..973b689 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 24 13:16:09 UTC 2015 - dvaleev@suse.com
+
+- Allow building without clvm (boo#923127)
+  Keep clvm2 building by default
+
 -------------------------------------------------------------------
 Tue Jul 14 09:05:13 UTC 2015 - lwang@suse.com
 
diff --git a/lvm2.spec b/lvm2.spec
index e8c4314..a5fee08 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lvm2
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,8 @@
 %define device_mapper_version     1.02.97
 %define thin_provisioning_version 0.4.1
 
+%bcond_without clvm
+
 Name:           lvm2
 Version:        %{lvm2_version}
 Release:        0
@@ -140,7 +142,9 @@ Volume Manager.
 %patch1013 -p1
 %patch1014 -p1
 %patch1015 -p1
+%if %{with clvm}
 %patch1016 -p1
+%endif
 %patch1017 -p1
 %patch1018 -p1
 
@@ -179,12 +183,14 @@ autoreconf -fvi
 	--enable-realtime \
 	--enable-pkgconfig \
 	--enable-selinux \
+%if %{with clvm}
 	--with-clvmd=corosync \
 	--with-cluster=internal \
-	--datarootdir="%_datadir" \
-	--with-default-locking-dir=/run/lock/lvm \
 	--enable-cmirrord \
+%endif
+	--datarootdir="%_datadir" \
 	--enable-lvmetad \
+	--with-default-locking-dir=/run/lock/lvm \
 	--with-default-pid-dir=/run \
 	--with-default-dm-run-dir=/run \
 	--with-default-run-dir=/run/lvm \
@@ -203,10 +209,12 @@ export SUSE_ASNEEDED=0
 
 make %{?_smp_mflags}
 
+%if %{with clvm}
 #csm convert
 pushd bnz
 make %{?_smp_mflags}
 popd
+%endif
 
 pushd thin-provisioning-tools-%{thin_provisioning_version}
 autoreconf -fiv
@@ -225,9 +233,18 @@ install -d -m 755 "%buildroot/%_sysconfdir/lvm/metadata"
 install -m 644 %{SOURCE1} "%buildroot/%_sysconfdir/lvm/"
 mkdir -p "%buildroot/%_initddir"
 mkdir -p "%buildroot/%_sbindir"
+%if %{with clvm}
 install -m755 -D %{S:8} "%buildroot/%_prefix/lib/ocf/resource.d/lvm2/clvmd"
 install -m755 -D %{S:10} "%buildroot/%_prefix/lib/ocf/resource.d/lvm2/cmirrord"
 
+#csm-convert
+pushd bnz
+install -m755 -D csm-converter "%buildroot/%_sbindir/csm-converter"
+install -m755 -D csm-converter-helper "%buildroot/%_sbindir/csm-converter-helper"
+mv README.csm-converter ..
+popd
+%endif
+
 # Make sure libdevmapper.so.1.02 libdevmapper-event.so.1.02 still available
 # on Tumbleweed, as virtualbox.org didn't update their RPMs yet.
 rm -f libdm/ioctl/libdevmapper.so daemons/dmeventd/libdevmapper-event.so
@@ -248,13 +265,6 @@ pushd "%buildroot/%_sbindir"
 ln -sf ../../sbin/lvm lvm
 popd
 
-#csm-convert
-pushd bnz
-install -m755 -D csm-converter "%buildroot/%_sbindir/csm-converter"
-install -m755 -D csm-converter-helper "%buildroot/%_sbindir/csm-converter-helper"
-mv README.csm-converter ..
-popd
-
 pushd thin-provisioning-tools-%{thin_provisioning_version}
 %make_install
 popd
@@ -326,6 +336,7 @@ popd
 %_mandir/man8/vg*.8*
 %_mandir/man7/lvm*.7*
 
+%if %{with clvm}
 %package clvm
 Url:            http://sources.redhat.com/cluster/clvm/
 Version:        %{lvm2_version}
@@ -403,6 +414,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
 /usr/lib/ocf/resource.d/lvm2/cmirrord
 %{_mandir}/man8/cmirrord.8.gz
 /usr/lib/systemd/system/lvm2-cmirrord.service
+%endif
 
 %package devel
 Version:        %{lvm2_version}