diff --git a/python-pytz.changes b/python-pytz.changes
index e8f8f51..db4cc22 100644
--- a/python-pytz.changes
+++ b/python-pytz.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jun 30 17:39:12 UTC 2018 - astieger@suse.com
+
+- update to 2018.5:
+  * various python compatibility fixes
+- fix upstream signing key
+
 -------------------------------------------------------------------
 Sat Feb 17 18:35:20 UTC 2018 - arun@gmx.de
 
diff --git a/pytz.keyring b/python-pytz.keyring
similarity index 100%
rename from pytz.keyring
rename to python-pytz.keyring
diff --git a/python-pytz.spec b/python-pytz.spec
index 3df9ef9..5dbf3ff 100644
--- a/python-pytz.spec
+++ b/python-pytz.spec
@@ -19,15 +19,15 @@
 %define oldpython python
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pytz
-Version:        2018.3
+Version:        2018.5
 Release:        0
 Summary:        World timezone definitions, modern and historical
 License:        MIT
 Group:          Development/Languages/Python
-Url:            http://pytz.sourceforge.net
+URL:            http://pytz.sourceforge.net
 Source:         https://files.pythonhosted.org/packages/source/p/pytz/pytz-%{version}.tar.gz
 Source2:        https://files.pythonhosted.org/packages/source/p/pytz/pytz-%{version}.tar.gz.asc
-Source90:       pytz.keyring
+Source90:       %{name}.keyring
 # PATCH-FIX-UPSTREAM fix-tests.patch -- Remote tests which are known to be broken
 Patch0:         fix-tests.patch
 # PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database)
@@ -35,19 +35,17 @@ Patch1:         system_zoneinfo.patch
 # PATCH-FIX-UPSTREAM 0001-Fix-tests-for-older-timezone-versions.patch -- https://code.launchpad.net/~toabctl/pytz/+git/pytz/+merge/326419
 Patch2:         0001-Fix-tests-for-older-timezone-versions.patch
 BuildRequires:  %{python_module devel}
-BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
 # Test requirements
 BuildRequires:  %{python_module nose}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildRequires:  timezone
 Requires:       timezone
+BuildArch:      noarch
 %ifpython2
 Provides:       %{oldpython}-tz = %{version}
 Obsoletes:      %{oldpython}-tz < %{version}
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -82,8 +80,8 @@ sed -i '/^#!/d' ./pytz/tzfile.py
 %python_expand nosetests-%{$python_bin_suffix}
 
 %files %{python_files}
-%defattr(-,root,root,-)
-%doc LICENSE.txt README.txt
+%license LICENSE.txt
+%doc README.txt
 %{python_sitelib}/*
 
 %changelog
diff --git a/pytz-2018.3.tar.gz b/pytz-2018.3.tar.gz
deleted file mode 100644
index 867052d..0000000
--- a/pytz-2018.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0
-size 314214
diff --git a/pytz-2018.3.tar.gz.asc b/pytz-2018.3.tar.gz.asc
deleted file mode 100644
index fed34a3..0000000
--- a/pytz-2018.3.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEABECAAYFAlp9VJYACgkQAfqZj7rGN0pSTwCbBDpA5qZ5+WHLEnYlWWLeef6+
-qVEAoIIQFcOLP7M2bDT2ep6n6lSRdW21
-=aTry
------END PGP SIGNATURE-----
diff --git a/pytz-2018.5.tar.gz b/pytz-2018.5.tar.gz
new file mode 100644
index 0000000..c0bc769
--- /dev/null
+++ b/pytz-2018.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277
+size 318799
diff --git a/pytz-2018.5.tar.gz.asc b/pytz-2018.5.tar.gz.asc
new file mode 100644
index 0000000..da63706
--- /dev/null
+++ b/pytz-2018.5.tar.gz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQTH7MNlq28lXh65uhcB+pmPusY3SgUCWzXXSgAKCRAB+pmPusY3
+Skl7AJ0Td4qRGE3l4WHIxnWNxLQCgSjqiACeOrxzAp7+EkFFI82hcfkW3E1hBo4=
+=7jkN
+-----END PGP SIGNATURE-----