diff --git a/openobex.spec b/openobex.spec
index de56bc5..c36fbae 100644
--- a/openobex.spec
+++ b/openobex.spec
@@ -1,9 +1,9 @@
-%define udevdir %{_prefix}/lib/udev
+%global udevdir %{_prefix}/lib/udev
 
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -12,7 +12,6 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.g
 Patch0:  openobex-apps-flush.patch
 Patch1:  openobex-1.7-obex_push.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bluez-libs-devel, libusb-devel
 BuildRequires: cmake, doxygen, libxslt, docbook-style-xsl
 ExcludeArch: s390 s390x
@@ -46,37 +45,11 @@ calendar entries (vCal) and business cards (vCard) using the OBEX protocol.
 %patch1 -p1 -b .push
 
 %build
-cmake \
-      -D CMAKE_C_COMPILER:FILEPATH=%{_bindir}/gcc \
-      -D CMAKE_C_FLAGS:STRING="$RPM_OPT_FLAGS" \
-      -D CMAKE_EXE_LINKER_FLAGS:STRING="$RPM_LD_FLAGS" \
-      -D CMAKE_BUILD_TYPE:STRING=None \
-      -D CMAKE_INSTALL_BINDIR:PATH=%{_bindir} \
-      -D CMAKE_INSTALL_DATADIR:PATH=%{_datadir} \
-      -D CMAKE_INSTALL_DATAROOTDIR:PATH=%{_datarootdir} \
-      -D CMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/openobex \
-      -D CMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \
-      -D CMAKE_INSTALL_INFODIR:PATH=%{_infodir} \
-      -D CMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-      -D CMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \
-      -D CMAKE_INSTALL_LOCALEDIR:PATH=%{_datarootdir}/locale \
-      -D CMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \
-      -D CMAKE_INSTALL_MANDIR:PATH=%{_mandir} \
-      -D CMAKE_INSTALL_OLDINCLUDEDIR:PATH=%{_includedir} \
-      -D CMAKE_INSTALL_UDEVRULESDIR:PATH=%{udevdir}/rules.d \
-      -D CMAKE_INSTALL_PREFIX:PATH="" \
-      -D CMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \
-      -D CMAKE_INSTALL_SHAREDSTATEDIR:PATH=%{_sharedstatedir} \
-      -D CMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-      -D PKGCONFIG_INSTALL_DIR:PATH=%{_libdir}/pkgconfig \
-      -D CMAKE_LINKER:FILEPATH=%{_bindir}/ld \
-      -D CMAKE_MAKE_PROGRAM:FILEPATH=%{_bindir}/make \
-      -D CMAKE_VERBOSE_MAKEFILE:BOOL=YES \
-      -D bluetooth_LIBRARY:FILEPATH=%{_libdir}/libbluetooth.so \
-      -D usb_LIBRARY:FILEPATH=%{_libdir}/libusb.so \
-      -D CMAKE_SKIP_RPATH:BOOL=YES \
-      -D DOCBOOK_XSL_PREFIX:STRING=%{_datarootdir}/sgml/docbook/xsl-stylesheets \
-      .
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DCMAKE_SKIP_RPATH=YES \
+       -DCMAKE_VERBOSE_MAKEFILE=YES \
+       -DCMAKE_INSTALL_DOCDIR=%{_pkgdocdir} \
+       -DCMAKE_INSTALL_UDEVRULESDIR=%{udevdir}/rules.d
 
 make %{?_smp_mflags}
 make openobex-apps %{?_smp_mflags}
@@ -90,34 +63,29 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # and has some problems (multiple buffer overflows etc.)
 rm -f $RPM_BUILD_ROOT%{_bindir}/obex_test
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/obex_test.1*
-# don't ship cmake config files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/cmake
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog README
+# the HTML doc is distributed in the %%{name}-devel subpackage
+%exclude %{_pkgdocdir}/html
 %{_libdir}/libopenobex*.so.*
 %{_sbindir}/obex-check-device
 %{udevdir}/rules.d/60-openobex.rules
 
 %files devel
-%defattr(-, root, root)
+%doc %{_pkgdocdir}/html
 %{_libdir}/libopenobex*.so
-%dir %{_includedir}/openobex
-%{_includedir}/openobex/*.h
-%dir %{_docdir}/openobex
-%{_docdir}/openobex/*
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
 %{_libdir}/pkgconfig/openobex.pc
+%dir %{_libdir}/cmake
+%{_libdir}/cmake/OpenObex-%{version}
 
 %files apps
-%defattr(-, root, root)
 %{_bindir}/irobex_palm3
 %{_mandir}/man1/irobex_palm3.1*
 %{_bindir}/irxfer
@@ -132,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/obex_push.1*
 
 %changelog
+* Thu Jan 09 2014 Tomas Hozza <thozza@redhat.com> - 1.7.1-2
+- Distribute Cmake config files
+- Minor packaging / spec file changes
+
 * Thu Sep 26 2013 Tomas Hozza <thozza@redhat.com> - 1.7.1-1
 - New version 1.7.1