diff --git a/cryptsetup.spec b/cryptsetup.spec
index 1d3f1eb..012b449 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,4 +1,4 @@
-Summary: A utility for setting up encrypted disks
+Summary: Utility for setting up encrypted disks
 Name: cryptsetup
 Version: 2.3.4
 Release: 2%{?dist}
@@ -23,7 +23,7 @@ The cryptsetup package contains a utility for setting up
 disk encryption using dm-crypt kernel module.
 
 %package devel
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 Summary: Headers and libraries for using encrypted file systems
 Provides: cryptsetup-luks-devel = %{version}-%{release}
@@ -75,33 +75,29 @@ chmod -x misc/dracut_90reencrypt/*
 
 %install
 %make_install
-rm -rf %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}%{_libdir}/*.la
 
 %find_lang cryptsetup
 
 %ldconfig_scriptlets -n cryptsetup-libs
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc AUTHORS FAQ docs/*ReleaseNotes
 %{_mandir}/man8/cryptsetup.8.gz
 %{_sbindir}/cryptsetup
 
 %files -n veritysetup
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_mandir}/man8/veritysetup.8.gz
 %{_sbindir}/veritysetup
 
 %files -n integritysetup
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_mandir}/man8/integritysetup.8.gz
 %{_sbindir}/integritysetup
 
 %files reencrypt
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc misc/dracut_90reencrypt
 %{_mandir}/man8/cryptsetup-reencrypt.8.gz
@@ -114,7 +110,6 @@ rm -rf %{buildroot}/%{_libdir}/*.la
 %{_libdir}/pkgconfig/libcryptsetup.pc
 
 %files libs -f cryptsetup.lang
-%{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LGPL
 %{_libdir}/libcryptsetup.so.*
 %{_tmpfilesdir}/cryptsetup.conf