diff --git a/boost_168.patch b/boost_168.patch
new file mode 100644
index 0000000..5ba316f
--- /dev/null
+++ b/boost_168.patch
@@ -0,0 +1,19 @@
+Index: libcmis-0.5.1/src/libcmis/xml-utils.cxx
+===================================================================
+--- libcmis-0.5.1.orig/src/libcmis/xml-utils.cxx
++++ libcmis-0.5.1/src/libcmis/xml-utils.cxx
+@@ -31,7 +31,14 @@
+ #include <sstream>
+ #include <stdlib.h>
+ 
++#include <boost/version.hpp>
++
++#if BOOST_VERSION >= 106800
++#include <boost/uuid/detail/sha1.hpp>
++#else
+ #include <boost/uuid/sha1.hpp>
++#endif
++
+ #include <curl/curl.h>
+ 
+ #include "xml-utils.hxx"
diff --git a/cmis-client.changes b/cmis-client.changes
index e759186..18a5b4e 100644
--- a/cmis-client.changes
+++ b/cmis-client.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Aug 17 07:17:25 UTC 2018 - adam.majer@suse.de
+
+- use %license to install licenses
+- spec file cleanup
+- boost_168.patch: fix build with Boost 1.68 where the compatibility
+  header for Uuid's sha1 header was removed. (boo#1105173)
+
 -------------------------------------------------------------------
 Wed Feb  8 10:09:12 UTC 2017 - jengelh@inai.de
 
diff --git a/cmis-client.spec b/cmis-client.spec
index b1eaa04..1f6d63c 100644
--- a/cmis-client.spec
+++ b/cmis-client.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cmis-client
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -23,18 +23,13 @@ Name:           cmis-client
 Version:        0.5.1
 Release:        0
 Summary:        Sample CMIS client
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+License:        MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
-Url:            https://github.com/tdf/libcmis
+URL:            https://github.com/tdf/libcmis
 Source0:        https://github.com/tdf/%{_name}/releases/download/v%{version}/%{_name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM: declare automake foreign
 Patch0:         declare-automake-foreign.patch
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_date_time-devel
-BuildRequires:  libboost_program_options-devel
-%else
-BuildRequires:  boost-devel >= 1.36
-%endif
+Patch1:         boost_168.patch
 BuildRequires:  docbook2X
 BuildRequires:  gcc-c++
 BuildRequires:  intltool
@@ -45,7 +40,12 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires:       %{_name}-%{sover} = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_date_time-devel
+BuildRequires:  libboost_program_options-devel
+%else
+BuildRequires:  boost-devel >= 1.36
+%endif
 
 %description
 Sample client to access CMIS-enabled repositories using libcmis.
@@ -90,6 +90,7 @@ the CMIS interface.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 autoreconf -fvi
@@ -103,7 +104,7 @@ export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
@@ -120,28 +121,25 @@ make check %{?_smp_mflags}
 %postun -n %{_name}-c-%{sover} -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
 %{_bindir}/cmis-client
-%{_mandir}/man1/cmis-client.1.*
+%{_mandir}/man1/cmis-client.1%{?ext_man}
 
 %files -n %{_name}-%{sover}
-%defattr(-, root, root)
-%doc AUTHORS COPYING.LGPL COPYING.MPL COPYING.GPL NEWS
+%doc AUTHORS NEWS
+%license COPYING.LGPL COPYING.MPL COPYING.GPL
 %{_libdir}/%{_name}-%{incname}.so.*
 
 %files -n %{_name}-devel
-%defattr(-,root,root)
 %{_includedir}/%{_name}-%{incname}
 %{_libdir}/pkgconfig/%{_name}-%{incname}.pc
 %{_libdir}/%{_name}-%{incname}.so
 
 %files -n %{_name}-c-%{sover}
-%defattr(-, root, root)
-%doc AUTHORS COPYING.LGPL COPYING.MPL COPYING.GPL NEWS
+%doc AUTHORS NEWS
+%license COPYING.LGPL COPYING.MPL COPYING.GPL
 %{_libdir}/%{_name}-c-%{incname}.so.*
 
 %files -n %{_name}-c-devel
-%defattr(-,root,root)
 %{_includedir}/%{_name}-c-%{incname}
 %{_libdir}/pkgconfig/%{_name}-c-%{incname}.pc
 %{_libdir}/%{_name}-c-%{incname}.so