diff --git a/.gitignore b/.gitignore
index 49c0fd0..de70df9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ upower-0.9.5.tar.bz2
 /upower-0.99.3.tar.xz
 /upower-0.99.4.tar.xz
 /upower-0.99.5.tar.xz
+/upower-0.99.6.tar.xz
diff --git a/0001-linux-Correctly-close-inhibitor-FD.patch b/0001-linux-Correctly-close-inhibitor-FD.patch
deleted file mode 100644
index d1c37c1..0000000
--- a/0001-linux-Correctly-close-inhibitor-FD.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 502c63b54944064dfd5f5cc4463bfb3d457a95c0 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Thu, 3 Aug 2017 17:12:50 +0200
-Subject: [PATCH] linux: Correctly close inhibitor FD
-
-The unref of the FD list for the inhibitor was missing which means that
-the FD was leaked and the lock was never released. This means that for
-each suspend/resume cycle a new inhibitor would be added.
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- src/linux/up-backend.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
-index c5f8fd9..e7684a2 100644
---- a/src/linux/up-backend.c
-+++ b/src/linux/up-backend.c
-@@ -475,7 +475,7 @@ static void
- up_backend_inhibitor_lock_take (UpBackend *backend)
- {
- 	GVariant *out, *input;
--	GUnixFDList *fds;
-+	GUnixFDList *fds = NULL;
- 	GError *error = NULL;
- 
- 	if (backend->priv->logind_inhibitor_fd > -1) {
-@@ -505,11 +505,13 @@ up_backend_inhibitor_lock_take (UpBackend *backend)
- 	if (g_unix_fd_list_get_length (fds) != 1) {
- 		g_warning ("Unexpected values returned by logind's 'Inhibit'");
- 		g_variant_unref (out);
-+		g_object_unref (fds);
- 		return;
- 	}
- 
- 	backend->priv->logind_inhibitor_fd = g_unix_fd_list_get (fds, 0, NULL);
- 	g_variant_unref (out);
-+	g_object_unref (fds);
- 
- 	g_debug ("Acquired inhibitor lock (%i)", backend->priv->logind_inhibitor_fd);
- }
--- 
-2.13.5
-
diff --git a/sources b/sources
index b3d1564..efb3296 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (upower-0.99.5.tar.xz) = 2fb06bea69455f538146576665e36c5b91eb18b119fa77e29d383fcb2a86ea58650b82e258f157d03c40147ecb12ea545997199580f0e24847ac6ea04d46e5ea
+SHA512 (upower-0.99.6.tar.xz) = 7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f
diff --git a/upower.spec b/upower.spec
index bae05c4..0569e88 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,14 +1,12 @@
 Summary:        Power Management Service
 Name:           upower
-Version:        0.99.5
-Release:        4%{?dist}
+Version:        0.99.6
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://upower.freedesktop.org/
 Source0:        http://upower.freedesktop.org/releases/upower-%{version}.tar.xz
 
-Patch0:		0001-linux-Correctly-close-inhibitor-FD.patch
-
 BuildRequires:  sqlite-devel
 BuildRequires:  libtool
 BuildRequires:  intltool
@@ -111,6 +109,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_datadir}/gtk-doc/html/UPower/*
 
 %changelog
+* Mon Sep 11 2017 Richard Hughes <rhughes@redhat.com> - 0.99.6-1
+- New upstream release
+- Detect joysticks as gaming input devices
+- Fix crash when '@' is present in the device name
+- Grab the model name from device if unavailable from battery
+
 * Thu Aug 24 2017 Benjamin Berg <bberg@redhat.com> - 0.99.5-4
 - Add patch to not correctly close the inhibitor FD