diff --git a/.gitignore b/.gitignore
index 78baf35..7d83253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /copr-keygen-1.60.tar.gz
+/copr-keygen-1.65.tar.gz
diff --git a/copr-keygen.spec b/copr-keygen.spec
index 2bfb25e..ba35264 100644
--- a/copr-keygen.spec
+++ b/copr-keygen.spec
@@ -7,8 +7,8 @@
 # this package doesn't support rhel7- since it doesn't have python3* packages
 
 Name:       copr-keygen
-Version:    1.60
-Release:    5%{?dist}
+Version:    1.65
+Release:    1%{?dist}
 Summary:    Part of Copr build system. Aux service that generate keys for signd
 
 Group:      Applications/Productivity
@@ -19,7 +19,6 @@ URL:        https://fedorahosted.org/copr/
 # cd copr/keygen
 # tito build --tgz
 Source0: %{name}-%{version}.tar.gz
-Patch0:  fix-assert-called-once.patch
 
 BuildArch:  noarch
 BuildRequires: util-linux
@@ -89,7 +88,7 @@ This package contains document for copr-keygen service.
 
 
 %prep
-%autosetup -p1
+%setup -q
 
 
 %build
@@ -151,13 +150,20 @@ getent passwd copr-signer >/dev/null || \
 
 
 %post
+semanage fcontext -a -t httpd_log_t '/var/log/copr-keygen(/.*)?'
+restorecon -rv /var/log/copr-keygen/
+
+semanage fcontext -a -t httpd_var_lib_t '/var/lib/copr-keygen(/.*)?'
+restorecon -rv /var/lib/copr-keygen/
+
 service httpd condrestart
 
 %postun
 service httpd condrestart
 
 %files
-%doc LICENSE docs/INSTALL.rst docs/README.rst
+%license LICENSE
+%doc docs/INSTALL.rst docs/README.rst
 %doc configs/local_settings.py.example
 
 %{_datadir}/copr-keygen/*
@@ -181,17 +187,25 @@ service httpd condrestart
 
 
 %changelog
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.60-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+* Mon Mar 14 2016 Jakub Kadlčík <jkadlcik@redhat.com> 1.65-1
+- GnuPG 2.1 compatibility - key creation fix
+
+* Mon Nov 16 2015 Miroslav Suchý <msuchy@redhat.com> 1.64-1
+- Fixed invalid classifiers
 
-* Thu Nov 19 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.60-4
-- Fix tests to compile under Python 3.5
+* Thu Jul 02 2015 Valentin Gologuzov <vgologuz@redhat.com> 1.63-1
+- fix race condition during key-pair creation, now should be safe with
+  file locking.
 
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+* Wed May 20 2015 Valentin Gologuzov <vgologuz@redhat.com> 1.62-1
+- [keygen] set selinux context httpd_var_lib_t to /var/lib/copr-keygen
 
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.60-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+* Fri May 15 2015 Miroslav Suchý <msuchy@redhat.com> 1.61-1
+- [keygen] fix SELinux context for /var/log/copr-keygen/ to be accessable by
+  httpd process
+- mark license as license in spec
+- [backend] refactored mockremote
+- [PEP8] cleanup done
 
 * Fri Oct 24 2014 Valentin Gologuzov <vgologuz@redhat.com> 1.60-1
 - [keygen] added option "--no-auto-check-trustdb" to gpg wrapper
diff --git a/fix-assert-called-once.patch b/fix-assert-called-once.patch
deleted file mode 100644
index 8245dd5..0000000
--- a/fix-assert-called-once.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git copr-keygen-1.60/tests/test_logic.py~ copr-keygen-1.60/tests/test_logic.py
-index 6cabb4fb47..779086794d 100644
---- copr-keygen-1.60/tests/test_logic.py~
-+++ copr-keygen-1.60/tests/test_logic.py
-@@ -161,7 +161,7 @@ class TestGenKey(TestCase):
-         user_exists.return_value = True
-         logic.create_new_key(app, TEST_NAME, TEST_EMAIL, TEST_KEYLENGTH)
- 
--        user_exists.assert_called_once()
-+        assert user_exists.called
-         assert not popen.called
- 
-     def test_error_popen(self, popen, user_exists):
diff --git a/sources b/sources
index e6edaf6..61c8af3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e645887de8ad95935d2eda1bc2e40fe  copr-keygen-1.60.tar.gz
+e34e32dff8ce8f3eadd733785f962489  copr-keygen-1.65.tar.gz