diff --git a/keyring-5.3.zip b/keyring-5.3.zip
deleted file mode 100644
index 99adfed..0000000
--- a/keyring-5.3.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac2b4dc17e6edfb804b09ade15df79f251522e442976ea0c8ea0051474502cf5
-size 87921
diff --git a/keyring-5.4.tar.gz b/keyring-5.4.tar.gz
new file mode 100644
index 0000000..52e8142
--- /dev/null
+++ b/keyring-5.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45891cd0af4c4af70fbed7ec6e3964d0261c14188de9ab31030c9d02272e22d2
+size 68986
diff --git a/keyring-gnome-3.18.patch b/keyring-gnome-3.18.patch
new file mode 100644
index 0000000..2aef756
--- /dev/null
+++ b/keyring-gnome-3.18.patch
@@ -0,0 +1,12 @@
+Index: keyring-5.4/keyring/backends/Gnome.py
+===================================================================
+--- keyring-5.4.orig/keyring/backends/Gnome.py
++++ keyring-5.4/keyring/backends/Gnome.py
+@@ -3,6 +3,7 @@ import os
+ try:
+     from gi import Repository
+     if Repository.get_default().enumerate_versions('GnomeKeyring'):
++        gi.require_version('GnomeKeyring', '1.0')
+         from gi.repository import GnomeKeyring
+ except ImportError:
+     pass
diff --git a/python-keyring.changes b/python-keyring.changes
index f9f51ac..3476f82 100644
--- a/python-keyring.changes
+++ b/python-keyring.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Sep  7 08:40:56 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 5.4:
+  + Prefer setuptools_scm to hgtools.
+- Replace python-hgtools BuildRequires with python-setuptools_scm,
+  following upstreams change back to setuptools_scm.
+- Add keyring-gnome-3.18.patch: Silence a warning: on GNOME 3.18,
+  it is mandatory to specify the version to be imported.
+
 -------------------------------------------------------------------
 Tue Apr 28 11:06:12 UTC 2015 - mimi.vx@gmail.com
 
diff --git a/python-keyring.spec b/python-keyring.spec
index c6c4703..b547fb2 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -17,18 +17,19 @@
 
 
 Name:           python-keyring
-Version:        5.3
+Version:        5.4
 Release:        0
 Url:            https://bitbucket.org/kang/python-keyring-lib
 Summary:        Store and access your passwords safely
 License:        Python-2.0 and MIT
 Group:          Development/Languages/Python
-Source:         https://pypi.python.org/packages/source/k/keyring/keyring-%{version}.zip
+Source:         https://pypi.python.org/packages/source/k/keyring/keyring-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM keyring-gnome-3.18.patch dimstar@opensuse.org -- Silence a warning when run in GNOME 3.18: gi requires versioned imports now.
+Patch0:         keyring-gnome-3.18.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-BuildRequires:  python-hgtools
 BuildRequires:  python-setuptools
-BuildRequires:  unzip
+BuildRequires:  python-setuptools_scm
 # Test requirements:
 BuildRequires:  python-mock
 BuildRequires:  python-pytest
@@ -55,6 +56,7 @@ from python. It can be used in any application that needs safe password storage.
 
 %prep
 %setup -q -n keyring-%{version}
+%patch0 -p1
 # For rpmlint warning: remove shebang from python library:
 sed -i '/^#!/d' keyring/cli.py keyring/backends/_win_crypto.py