diff --git a/.gitignore b/.gitignore
index 373d472..386f5e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/kleopatra-16.04.1.tar.xz
-/kleopatra-16.04.2.tar.xz
-/kleopatra-16.04.3.tar.xz
 /kleopatra-16.08.0.tar.xz
diff --git a/kleopatra-16.08.0-libassuan2_includes.patch b/kleopatra-16.08.0-libassuan2_includes.patch
new file mode 100644
index 0000000..fb92af1
--- /dev/null
+++ b/kleopatra-16.08.0-libassuan2_includes.patch
@@ -0,0 +1,14 @@
+diff -up kleopatra-16.08.0/src/CMakeLists.txt.assuan kleopatra-16.08.0/src/CMakeLists.txt
+--- kleopatra-16.08.0/src/CMakeLists.txt.assuan	2016-09-04 12:46:21.864264976 -0500
++++ kleopatra-16.08.0/src/CMakeLists.txt	2016-09-04 12:45:59.413068508 -0500
+@@ -40,8 +40,10 @@ set(_kleopatra_uiserver_SRCS
+   )
+ 
+ if(ASSUAN2_FOUND)
++  include_directories(${ASSUAN2_INCLUDES})
+   set(_kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES})
+ else()
++  include_directories(${ASSUAN_INCLUDES})  
+   if(WIN32)
+     set(_kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES})
+   else()
diff --git a/kleopatra.spec b/kleopatra.spec
index e8115e2..4829958 100644
--- a/kleopatra.spec
+++ b/kleopatra.spec
@@ -1,10 +1,13 @@
-Name:           kleopatra
+Name:    kleopatra
 Version: 16.08.0
 Release: 1%{?dist}
-Summary:        KDE certificate manager and unified crypto GUI
+Summary: KDE certificate manager and unified crypto GUI
 
-License:        GPLv2+
-URL:            http://projects.kde.org/?p=%{name}.git
+# code: GPLv2+
+# docs: GFDL
+License: GPLv2+ and GFDL
+
+URL:     http://projects.kde.org/?p=%{name}.git
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -14,9 +17,12 @@ URL:            http://projects.kde.org/?p=%{name}.git
 %endif
 Source0:        http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable patches
+Patch100: kleopatra-16.08.0-libassuan2_includes.patch
+
 BuildRequires:  boost-devel
-BuildRequires:  extra-cmake-modules >= 5.19.0
-BuildRequires:  kf5-rpm-macros >= 5.19.0
+BuildRequires:  extra-cmake-modules >= 5.23.0
+BuildRequires:  kf5-rpm-macros >= 5.23.0
 
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Test)
@@ -54,7 +60,7 @@ Requires:       %{name} = %{version}-%{release}
 
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -p1
 
 
 %build
@@ -89,8 +95,7 @@ update-desktop-database -q &> /dev/null ||:
 fi
 
 %files
-#TODO: Missing upstream
-#%license COPYING.LIB
+%license COPYING COPYING.DOC
 %{_kf5_sysconfdir}/xdg/kleopatra.categories
 %{_kf5_bindir}/kleopatra
 %{_kf5_bindir}/kwatchgnupg