diff --git a/device-mapper.changes b/device-mapper.changes
index 666d1b6..6c488b6 100644
--- a/device-mapper.changes
+++ b/device-mapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com
+
+- Pass over with spec-cleaner
+
 -------------------------------------------------------------------
 Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com
 
diff --git a/device-mapper.spec b/device-mapper.spec
index 08ce919..f5cbaff 100644
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -16,6 +16,8 @@
 #
 
 
+%define libname libdevmapper1_03
+%define libname_event libdevmapper-event1_03
 ### COMMON-DEF-BEGIN ###
 %define lvm2_version              2.02.168
 %define device_mapper_version     1.02.137
@@ -23,10 +25,6 @@
 %define dlm_version               3.99.1
 %define sanlock_version           3.3.0
 ### COMMON-DEF-END ###
-
-%define libname libdevmapper1_03
-%define libname_event libdevmapper-event1_03
-
 Name:           device-mapper
 Version:        %{device_mapper_version}
 Release:        0
@@ -37,7 +35,18 @@ Url:            http://www.sourceware.org/lvm2/
 Source:         ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz
 Source1:        ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc
 Source99:       baselibs.conf
-
+BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig
+BuildRequires:  suse-module-tools
+BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
+BuildRequires:  pkgconfig(libselinux)
+BuildRequires:  pkgconfig(libsepol)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(systemd)
+Requires:       thin-provisioning-tools >= %{thin_provisioning_version}
+Requires(post): coreutils
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
 # SUSE patches: 1000+ for LVM, 2000+ for device mapper
@@ -95,19 +104,6 @@ Patch2011:      lvm2-testsuite.patch
 Patch2012:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
 ### COMMON-PATCH-END ###
 
-BuildRequires:  gcc-c++
-BuildRequires:  pkgconfig
-BuildRequires:  suse-module-tools
-BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
-BuildRequires:  pkgconfig(libselinux)
-BuildRequires:  pkgconfig(libsepol)
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(systemd)
-Requires:       thin-provisioning-tools >= %{thin_provisioning_version}
-Requires(post): coreutils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
-
 %description
 Programs and man pages for configuring and using the device mapper.
 
@@ -225,9 +221,9 @@ ln -s %{_sbindir}/dmsetup %{buildroot}/sbin/dmsetup
 %{_sbindir}/dmsetup
 %{_sbindir}/dmeventd
 %{_sbindir}/dmstats
-%{_mandir}/man8/dmstats.8.*
-%{_mandir}/man8/dmsetup.8.*
-%{_mandir}/man8/dmeventd.8.*
+%{_mandir}/man8/dmstats.8%{ext_man}
+%{_mandir}/man8/dmsetup.8%{ext_man}
+%{_mandir}/man8/dmeventd.8%{ext_man}
 %{_udevrulesdir}/10-dm.rules
 %{_udevrulesdir}/13-dm-disk.rules
 %{_udevrulesdir}/95-dm-notify.rules
@@ -238,6 +234,7 @@ ln -s %{_sbindir}/dmsetup %{buildroot}/sbin/dmsetup
 ##############################################################################
 # Library for device-mapper
 ##############################################################################
+
 %package -n %{libname}
 Summary:        Library for device-mapper
 Group:          System/Libraries
@@ -257,6 +254,7 @@ Device mapper main shared library
 ##############################################################################
 # Event library for device-mapper
 ##############################################################################
+
 %package -n %{libname_event}
 Summary:        Event library for device-mapper
 Group:          System/Libraries
@@ -276,6 +274,7 @@ Device mapper event daemon shared library
 ##############################################################################
 # Development package for the device mapper
 ##############################################################################
+
 %package devel
 Summary:        Development package for the device mapper
 Group:          Development/Libraries/C and C++
diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes
index 666d1b6..6c488b6 100644
--- a/lvm2-clvm.changes
+++ b/lvm2-clvm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com
+
+- Pass over with spec-cleaner
+
 -------------------------------------------------------------------
 Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com
 
diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec
index f9d41fd..2f753c4 100644
--- a/lvm2-clvm.spec
+++ b/lvm2-clvm.spec
@@ -23,7 +23,6 @@
 %define dlm_version               3.99.1
 %define sanlock_version           3.3.0
 ### COMMON-DEF-END ###
-
 Name:           lvm2-clvm
 Version:        %{lvm2_version}
 Release:        0
@@ -35,7 +34,18 @@ Source:         ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz
 Source1:        ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc
 Source2:        clvmd.ocf
 Source3:        cmirrord.ocf
-
+BuildRequires:  libcorosync-devel
+BuildRequires:  libdlm-devel
+BuildRequires:  pkgconfig
+BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
+BuildRequires:  pkgconfig(devmapper)
+BuildRequires:  pkgconfig(libudev)
+Requires:       corosync
+Requires:       device-mapper >= %{device_mapper_version}
+Requires:       lvm2 = %{version}
+Requires:       lvm2-cmirrord
+Obsoletes:      cmirrord < %{version}
+Provides:       cmirrord = %{version}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
 # SUSE patches: 1000+ for LVM, 2000+ for device mapper
@@ -93,19 +103,6 @@ Patch2011:      lvm2-testsuite.patch
 Patch2012:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
 ### COMMON-PATCH-END ###
 
-BuildRequires:  libcorosync-devel
-BuildRequires:  libdlm-devel
-BuildRequires:  pkgconfig
-BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
-BuildRequires:  pkgconfig(devmapper)
-BuildRequires:  pkgconfig(libudev)
-Requires:       corosync
-Requires:       device-mapper >= %{device_mapper_version}
-Requires:       lvm2 = %{version}
-Requires:       lvm2-cmirrord
-Obsoletes:      cmirrord < %{version}
-Provides:       cmirrord = %{version}
-
 %description
 A daemon for using LVM2 Logival Volumes in a clustered environment.
 
@@ -216,11 +213,12 @@ rm %{buildroot}%{_mandir}/man8/lvm2-activation-generator.8
 %{_unitdir}/lvm2-clvmd.service
 %{_unitdir}/lvm2-cluster-activation.service
 %{_libexecdir}/systemd/lvm2-cluster-activation
-%{_mandir}/man8/clvmd.8.gz
+%{_mandir}/man8/clvmd.8%{ext_man}
 
 ##############################################################################
 # Clustered RAID 1 support using device-mapper and corosync
 ##############################################################################
+
 %package -n lvm2-cmirrord
 Summary:        Clustered RAID 1 support using device-mapper and corosync
 Group:          Productivity/Clustering/HA
@@ -238,6 +236,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
 %{_libexecdir}/ocf/resource.d/lvm2/cmirrord
 %{_libexecdir}/systemd/system/lvm2-cmirrord.service
 %{_sbindir}/rclvm2-cmirrord
-%{_mandir}/man8/cmirrord.8.*
+%{_mandir}/man8/cmirrord.8%{ext_man}
 
 %changelog
diff --git a/lvm2.changes b/lvm2.changes
index 666d1b6..6c488b6 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com
+
+- Pass over with spec-cleaner
+
 -------------------------------------------------------------------
 Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com
 
diff --git a/lvm2.spec b/lvm2.spec
index 6367cf1..dcaa55b 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -16,6 +16,9 @@
 #
 
 
+%define _udevdir %(pkg-config --variable=udevdir udev)
+%define applib liblvm2app2_2
+%define cmdlib liblvm2cmd2_02
 ### COMMON-DEF-BEGIN ###
 %define lvm2_version              2.02.168
 %define device_mapper_version     1.02.137
@@ -23,11 +26,6 @@
 %define dlm_version               3.99.1
 %define sanlock_version           3.3.0
 ### COMMON-DEF-END ###
-
-%define _udevdir %(pkg-config --variable=udevdir udev)
-%define applib liblvm2app2_2
-%define cmdlib liblvm2cmd2_02
-
 Name:           lvm2
 Version:        %{lvm2_version}
 Release:        0
@@ -38,7 +36,22 @@ Url:            http://www.sourceware.org/lvm2/
 Source:         ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 Source1:        lvm.conf
 Source42:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz.asc
-
+BuildRequires:  gcc-c++
+BuildRequires:  libaio-devel
+BuildRequires:  libselinux-devel
+BuildRequires:  pkgconfig
+BuildRequires:  readline-devel
+BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
+BuildRequires:  pkgconfig(blkid)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(udev)
+Requires:       device-mapper >= %{device_mapper_version}
+Requires(post): coreutils
+Requires(postun): coreutils
+Provides:       lvm = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
 # SUSE patches: 1000+ for LVM, 2000+ for device mapper
@@ -96,23 +109,6 @@ Patch2011:      lvm2-testsuite.patch
 Patch2012:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
 ### COMMON-PATCH-END ###
 
-BuildRequires:  gcc-c++
-BuildRequires:  libaio-devel
-BuildRequires:  libselinux-devel
-BuildRequires:  pkgconfig
-BuildRequires:  readline-devel
-BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
-BuildRequires:  pkgconfig(blkid)
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(systemd)
-BuildRequires:  pkgconfig(udev)
-Requires:       device-mapper >= %{device_mapper_version}
-Requires(post): coreutils
-Requires(postun): coreutils
-Provides:       lvm = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
-
 %description
 Programs and man pages for configuring and using the LVM2 Logical
 Volume Manager.
@@ -372,67 +368,67 @@ popd
 /sbin/vgs
 /sbin/vgscan
 /sbin/vgsplit
-%{_mandir}/man5/lvm.conf.5.gz
-%{_mandir}/man7/lvmcache.7.gz
-%{_mandir}/man7/lvmraid.7.gz
-%{_mandir}/man7/lvmreport.7.gz
-%{_mandir}/man7/lvmthin.7.gz
-%{_mandir}/man7/lvmsystemid.7.gz
-%{_mandir}/man8/fsadm.8.gz
-%{_mandir}/man8/lvchange.8.gz
-%{_mandir}/man8/lvconvert.8.gz
-%{_mandir}/man8/lvcreate.8.gz
-%{_mandir}/man8/lvdisplay.8.gz
-%{_mandir}/man8/lvextend.8.gz
-%{_mandir}/man8/lvm.8.gz
-%{_mandir}/man8/lvm2-activation-generator.8.gz
-%{_mandir}/man8/lvm-config.8.gz
-%{_mandir}/man8/lvmconfig.8.gz
-%{_mandir}/man8/lvm-dumpconfig.8.gz
-%{_mandir}/man8/lvmchange.8.gz
-%{_mandir}/man8/lvmconf.8.gz
-%{_mandir}/man8/lvmdiskscan.8.gz
-%{_mandir}/man8/lvmdump.8.gz
-%{_mandir}/man8/lvm-fullreport.8.gz
-%{_mandir}/man8/lvmsadc.8.gz
-%{_mandir}/man8/lvmsar.8.gz
-%{_mandir}/man8/lvreduce.8.gz
-%{_mandir}/man8/lvremove.8.gz
-%{_mandir}/man8/lvrename.8.gz
-%{_mandir}/man8/lvresize.8.gz
-%{_mandir}/man8/lvs.8.gz
-%{_mandir}/man8/lvscan.8.gz
-%{_mandir}/man8/pvchange.8.gz
-%{_mandir}/man8/pvck.8.gz
-%{_mandir}/man8/pvcreate.8.gz
-%{_mandir}/man8/pvdisplay.8.gz
-%{_mandir}/man8/pvmove.8.gz
-%{_mandir}/man8/pvremove.8.gz
-%{_mandir}/man8/pvresize.8.gz
-%{_mandir}/man8/pvs.8.gz
-%{_mandir}/man8/pvscan.8.gz
-%{_mandir}/man8/vgcfgbackup.8.gz
-%{_mandir}/man8/vgcfgrestore.8.gz
-%{_mandir}/man8/vgchange.8.gz
-%{_mandir}/man8/vgck.8.gz
-%{_mandir}/man8/vgconvert.8.gz
-%{_mandir}/man8/vgcreate.8.gz
-%{_mandir}/man8/vgdisplay.8.gz
-%{_mandir}/man8/vgexport.8.gz
-%{_mandir}/man8/vgextend.8.gz
-%{_mandir}/man8/vgimport.8.gz
-%{_mandir}/man8/vgimportclone.8.gz
-%{_mandir}/man8/vgmerge.8.gz
-%{_mandir}/man8/vgmknodes.8.gz
-%{_mandir}/man8/vgreduce.8.gz
-%{_mandir}/man8/vgremove.8.gz
-%{_mandir}/man8/vgrename.8.gz
-%{_mandir}/man8/vgs.8.gz
-%{_mandir}/man8/vgscan.8.gz
-%{_mandir}/man8/vgsplit.8.gz
-%{_mandir}/man8/lvmetad.8.gz
-%{_mandir}/man8/lvm-lvpoll.8.gz
-%{_mandir}/man8/blkdeactivate.8.gz
+%{_mandir}/man5/lvm.conf.5%{ext_man}
+%{_mandir}/man7/lvmcache.7%{ext_man}
+%{_mandir}/man7/lvmraid.7%{ext_man}
+%{_mandir}/man7/lvmreport.7%{ext_man}
+%{_mandir}/man7/lvmthin.7%{ext_man}
+%{_mandir}/man7/lvmsystemid.7%{ext_man}
+%{_mandir}/man8/fsadm.8%{ext_man}
+%{_mandir}/man8/lvchange.8%{ext_man}
+%{_mandir}/man8/lvconvert.8%{ext_man}
+%{_mandir}/man8/lvcreate.8%{ext_man}
+%{_mandir}/man8/lvdisplay.8%{ext_man}
+%{_mandir}/man8/lvextend.8%{ext_man}
+%{_mandir}/man8/lvm.8%{ext_man}
+%{_mandir}/man8/lvm2-activation-generator.8%{ext_man}
+%{_mandir}/man8/lvm-config.8%{ext_man}
+%{_mandir}/man8/lvmconfig.8%{ext_man}
+%{_mandir}/man8/lvm-dumpconfig.8%{ext_man}
+%{_mandir}/man8/lvmchange.8%{ext_man}
+%{_mandir}/man8/lvmconf.8%{ext_man}
+%{_mandir}/man8/lvmdiskscan.8%{ext_man}
+%{_mandir}/man8/lvmdump.8%{ext_man}
+%{_mandir}/man8/lvm-fullreport.8%{ext_man}
+%{_mandir}/man8/lvmsadc.8%{ext_man}
+%{_mandir}/man8/lvmsar.8%{ext_man}
+%{_mandir}/man8/lvreduce.8%{ext_man}
+%{_mandir}/man8/lvremove.8%{ext_man}
+%{_mandir}/man8/lvrename.8%{ext_man}
+%{_mandir}/man8/lvresize.8%{ext_man}
+%{_mandir}/man8/lvs.8%{ext_man}
+%{_mandir}/man8/lvscan.8%{ext_man}
+%{_mandir}/man8/pvchange.8%{ext_man}
+%{_mandir}/man8/pvck.8%{ext_man}
+%{_mandir}/man8/pvcreate.8%{ext_man}
+%{_mandir}/man8/pvdisplay.8%{ext_man}
+%{_mandir}/man8/pvmove.8%{ext_man}
+%{_mandir}/man8/pvremove.8%{ext_man}
+%{_mandir}/man8/pvresize.8%{ext_man}
+%{_mandir}/man8/pvs.8%{ext_man}
+%{_mandir}/man8/pvscan.8%{ext_man}
+%{_mandir}/man8/vgcfgbackup.8%{ext_man}
+%{_mandir}/man8/vgcfgrestore.8%{ext_man}
+%{_mandir}/man8/vgchange.8%{ext_man}
+%{_mandir}/man8/vgck.8%{ext_man}
+%{_mandir}/man8/vgconvert.8%{ext_man}
+%{_mandir}/man8/vgcreate.8%{ext_man}
+%{_mandir}/man8/vgdisplay.8%{ext_man}
+%{_mandir}/man8/vgexport.8%{ext_man}
+%{_mandir}/man8/vgextend.8%{ext_man}
+%{_mandir}/man8/vgimport.8%{ext_man}
+%{_mandir}/man8/vgimportclone.8%{ext_man}
+%{_mandir}/man8/vgmerge.8%{ext_man}
+%{_mandir}/man8/vgmknodes.8%{ext_man}
+%{_mandir}/man8/vgreduce.8%{ext_man}
+%{_mandir}/man8/vgremove.8%{ext_man}
+%{_mandir}/man8/vgrename.8%{ext_man}
+%{_mandir}/man8/vgs.8%{ext_man}
+%{_mandir}/man8/vgscan.8%{ext_man}
+%{_mandir}/man8/vgsplit.8%{ext_man}
+%{_mandir}/man8/lvmetad.8%{ext_man}
+%{_mandir}/man8/lvm-lvpoll.8%{ext_man}
+%{_mandir}/man8/blkdeactivate.8%{ext_man}
 %{_udevdir}/rules.d/11-dm-lvm.rules
 %{_udevdir}/rules.d/69-dm-lvm-metad.rules
 %dir %{_sysconfdir}/lvm
@@ -467,6 +463,7 @@ popd
 ##############################################################################
 # LVM2 application api library
 ##############################################################################
+
 %package -n %{applib}
 Summary:        LVM2 application api library
 Group:          System/Libraries
@@ -485,6 +482,7 @@ LVM library for applications api
 ##############################################################################
 # LVM2 command line library
 ##############################################################################
+
 %package -n %{cmdlib}
 Summary:        LVM2 command line library
 Group:          System/Libraries
@@ -504,6 +502,7 @@ lvm devices without invoking a separate program.
 ##############################################################################
 # Development files for LVM2
 ##############################################################################
+
 %package devel
 Summary:        Development files for LVM2
 Group:          Development/Libraries/C and C++
@@ -524,8 +523,9 @@ This package provides development files for the LVM2 Logical Volume Manager.
 %{_libdir}/liblvm2cmd.so
 
 ##############################################################################
-# LVM2 Testsuite 
+# LVM2 Testsuite
 ##############################################################################
+
 %package testsuite
 Summary:        LVM2 Testsuite
 Group:          Development/Libraries/C and C++