diff --git a/Botan-1.10.10.tgz.asc b/Botan-1.10.10.tgz.asc
new file mode 100644
index 0000000..5649ade
--- /dev/null
+++ b/Botan-1.10.10.tgz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAABCgAGBQJVvvClAAoJEGIR6/Hvut+8DnIH/j5EW84EEcBKETvBQJqoPJt7
+Gsq4GKHDo75gBnWn2a2WGbbFIRuwjW4rpbUxxn6Nxazr87Hvg/RpRmd03/VYNvDO
+jai2oetGAbaV4e9kzSMI96jN6k3vpjtUqeY851PXnZxaILrx1iBqwppjVOZfIbNF
+hxzNgDgd1lA/dgfsh/BGr3MWDihNOxpICAbxmnXJU8bjiNT3RqebyOmins/Q6eVr
+Tl6D2CxeYV1QlxOOnd93PJW6RAJtgzw4kjUWIHB74DxhjtB06XV8jHQxlTRCEC/Q
+QDy2WlymjDQapyW6OzB0nRYCKtJQyQiZVCk4cIBq/8X3M4vjk7jErwqKvNPGcCU=
+=s4gl
+-----END PGP SIGNATURE-----
diff --git a/Botan.changes b/Botan.changes
index cb6f5e4..a52d541 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 24 10:48:11 UTC 2015 - mpluskal@suse.com
+
+- Add gpg signature
+- Cleanup spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Fri Aug 14 08:54:09 UTC 2015 - mvyskocil@opensuse.org
 
diff --git a/Botan.keyring b/Botan.keyring
new file mode 100644
index 0000000..13bfe31
--- /dev/null
+++ b/Botan.keyring
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQELBEGD1j0BCADHxPJkPcjJE+4Dlisx2hVc0Dj6JI1MSLrkM8R+2bOhVUSferxP
+T1EMPhfrAdOHTAloyvRThJztnZsNKqfLL49GGcBLdEGAVNks1pG37Teze5Lx1XIu
+zJFrozL2sqBy5C6nHpFgd1tcD68Rah2wp0u2cR9owXf1IqKdEfuo661+MTv7wTB1
+4hKV75nB7ZO6676SEZRILYM+7RJwKAKEmEPJc6hEf94VXn9ecNzaTlHgYkjhz9db
+LOd3od9XvuUw+LMR1dwBqMxbvR90MiXjbedDEkbArcZB9YOAIvEX/lC3qaW4XJt4
+iwHWl/YVZEfALcvQywe2CDrH5hO794wd9MpBAAYptBZCb3RhbiBEaXN0cmlidXRp
+b24gS2V5iEYEEBECAAYFAkj0n3AACgkQ3L4Y/6A1U7xBoQCeKYZeWapf7JZwgNBu
+1ca7ipl8R9EAoMUiYWB224r8drWZvNZ72E6KPZXziQE0BBMBAgAeBQJBg9Y9AhsD
+BgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEGIR6/Hvut+8s5gH/1U8xR02PyaHoZml
+5qEH5YQ09oLxwkYtXFr9INZ8TzCwIDeOCh0UKXJIDvHnTukGCPc08cGvlkMbflql
+/Kr/PzACo4arCyAf1wRdvhcFukV3Dvbe4MCg2Orn1Ljey47tAiGa12FVKkncC88B
+ujIk3Ne9GmK2p6ta4kbZrUcIbm7yDEaN25MWV0T1h6Zud+Yewn6LOwCo/pKv0NyJ
+QYZ5rki0th9Oa3Hi0N+1R4v8STqqkWYiZ3Uj8oD97iiCNXzmi7u+GChknq13lrQs
+8wOV8wmUaL9M++Ap00SsE+buYX+M6fXaDIvg1bI7V06lwxzPLJwNrbzwEjVuu7iv
+r+1p2ZmJAhwEEwECAAYFAkGD1lIACgkQXA+W6E7BbWvq/RAAllYrO2HGhpCioEQf
++aMfKzN+l1YTF3Yf4Z5xh7ea2qW20UZER0XFlPFiHBTtQOffk38DTXfIDdTBLf+W
+l+Sh1lShwQ3sSYCMZug5taYrGB3/3Z2EDzNfIZqqsDZSmPe4RZD6R3e3p67XP0rx
+m0IYS12JacAa3TJe+nvcSS5560UJLMXoBj6PHK/gvR07NS8GvM8wccgcGAWF/tJq
+A5A0oRIbl8ephDl6xr0GpybiL6aCMBh/uthOuTGyRpcFqcPzALZtoxYQSIRldG6i
+QhafcyIHTYH7JAWj69KIpW7iUGaj9CKnv+ggreF5EudclmasYywBaRKbw3nODxsN
+8IrSn/5KBqJ/V/AtN+fpxIywa1stfEPdb8NlEsiyPppvXYjAEvKWNoKJn8QTtlcG
+Bya8mcpIwmEJHHEQNbR7XkY+IKkzm6NAJOO8uTJ6ZU1sIuNKD+ytnH4QkQZjIqMZ
+mBEuMbBxLqX0QaN8a9SavatLevPFk09TVxzzD6LnhfZimQn9qWvWh7KgZlk5t7Am
+jUChrmwgwRFJiVMp3ZkmrScmDOzVWKFKehH6jAAhbkzXQbIyjIe2llYpEKWyQ3wN
+QSFN5WXqoI4K4IVQFpBDgX4RtCFWY/kVQiabKqEyfGrGNla3gK0gsq/1ZyxJ37h/
+0KYLwogm3qaNxN+AybeEmgDjtmY=
+=0I8E
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/Botan.spec b/Botan.spec
index 096dbf4..ab72cdd 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -18,16 +18,17 @@
 
 %define version_suffix 1_10-1
 %define short_version 1.10
-
 Name:           Botan
 Version:        1.10.10
 Release:        0
-Url:            http://botan.randombit.net
 Summary:        A C++ Crypto Library
 License:        BSD-2-Clause
 Group:          Development/Libraries/C and C++
+Url:            http://botan.randombit.net
 Source0:        http://botan.randombit.net/releases/%{name}-%{version}.tgz
-Source2:        baselibs.conf
+Source1:        http://botan.randombit.net/releases/%{name}-%{version}.tgz.asc
+Source2:        %{name}.keyring
+Source3:        baselibs.conf
 Patch0:         Botan-inttypes.patch
 Patch1:         Botan-ull_constants.patch.bz2
 Patch2:         Botan-fix_install_paths.patch
@@ -36,10 +37,6 @@ Patch6:         Botan-fix_pkgconfig.patch
 Patch7:         dont-set-mach-value.diff
 Patch8:         aarch64-support.patch
 Patch9:         ppc64le-support.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       bzip2 >= 1.0.2
-Requires:       gmp >= 4.1
-Requires:       zlib
 BuildRequires:  bzip2 >= 1.0.2
 BuildRequires:  gcc-c++
 BuildRequires:  gmp-devel
@@ -50,6 +47,10 @@ BuildRequires:  openssl-devel
 BuildRequires:  pkg-config
 BuildRequires:  python
 BuildRequires:  zlib-devel
+Requires:       bzip2 >= 1.0.2
+Requires:       gmp >= 4.1
+Requires:       zlib
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Botan is a C++ library that provides support for many common
@@ -68,15 +69,14 @@ X.509v3 certificates and CRLs. A wide variety of algorithms is
 supported, including RSA, DSA, DES, AES, MD5, and SHA-1.
 
 %package        -n libbotan-devel
+%define botan_docdir %{_docdir}/%{name}-%{version}
 Summary:        Development files for Botan
 Group:          Development/Libraries/C and C++
 Requires:       gmp-devel
+Requires:       libbotan-%{version_suffix} = %{version}
 Requires:       libbz2-devel
 Provides:       Botan-devel = %{version}
 Obsoletes:      Botan-devel < %{version}
-Requires:       libbotan-%{version_suffix} = %{version}
-
-%define botan_docdir %{_datadir}/doc/packages/%{name}-%{version}
 
 %description    -n libbotan-devel
 This package contains the header files and libraries needed to develop
@@ -95,21 +95,24 @@ programs that use the Botan library.
 
 %build
 export RPM_OPT_FLAGS
+
 %define common_config_flags --libdir=%{_lib} --with-bzip2 --with-zlib --with-gnump --with-openssl
-./configure.py --prefix=%_prefix --libdir=%{_libdir} \
-				--docdir=%{_defaultdocdir} \
-				--includedir=%{_includedir} \
-				--with-bzip2 \
-				--with-zlib \
-				--with-gnump \
-				--with-openssl \
-				--enable-modules=qt_mutex \
-				--with-tr1-implementation=system  \
-				--cpu=%_target_cpu
-make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS -I/usr/include/Qt"
+./configure.py \
+  --prefix=%{_prefix} \
+  --libdir=%{_libdir} \
+  --docdir=%{_defaultdocdir} \
+  --includedir=%{_includedir} \
+  --with-bzip2 \
+  --with-zlib \
+  --with-gnump \
+  --with-openssl \
+  --enable-modules=qt_mutex \
+  --with-tr1-implementation=system  \
+  --cpu=%{_target_cpu}
+make %{?_smp_mflags} WARN_FLAGS="%{optflags} -I/usr/include/Qt"
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 rm -f %{buildroot}/%{_libdir}/libbotan*.a
 
 %post -n libbotan-%{version_suffix} -p /sbin/ldconfig