diff --git a/vhba-kmp.changes b/vhba-kmp.changes
index f756061..d1c42e1 100644
--- a/vhba-kmp.changes
+++ b/vhba-kmp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug  7 13:28:09 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 20170610
+  * Support for Linux 4.11 (integrate vhba-signal.diff)
+- Drop vhba-signal.diff (merged upstream)
+
 -------------------------------------------------------------------
 Wed May 17 22:20:05 UTC 2017 - jengelh@inai.de
 
diff --git a/vhba-kmp.spec b/vhba-kmp.spec
index cd6d37c..2142314 100644
--- a/vhba-kmp.spec
+++ b/vhba-kmp.spec
@@ -17,7 +17,7 @@
 
 
 Name:           vhba-kmp
-Version:        20161009
+Version:        20170610
 Release:        0
 Summary:        Virtual SCSI Host Bus Adapter
 License:        GPL-2.0+
@@ -29,7 +29,6 @@ Source:         http://downloads.sf.net/cdemu/vhba-module-%version.tar.bz2
 Source2:        %name-preamble
 Patch1:         vhba-no-werror.diff
 Patch2:         vhba-devname.diff
-Patch3:         vhba-signal.diff
 BuildRequires:  kernel-syms >= 2.6.20
 BuildRequires:  modutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -57,7 +56,7 @@ Linux.
 %prep
 echo %flavors_to_build
 %setup -qn vhba-module-%version
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -p1
 
 %build
 for flavor in %flavors_to_build; do
diff --git a/vhba-module-20161009.tar.bz2 b/vhba-module-20161009.tar.bz2
deleted file mode 100644
index dc6a475..0000000
--- a/vhba-module-20161009.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd062d8bd61ccb8137622f837a0dadb771cc935981d8bccb2ad4de0bd11f33d9
-size 15623
diff --git a/vhba-module-20170610.tar.bz2 b/vhba-module-20170610.tar.bz2
new file mode 100644
index 0000000..e6bbe77
--- /dev/null
+++ b/vhba-module-20170610.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7970c93f989d9c4f2629371bf5ee7a76f95e4c12342c3320ddc528d0df02d9ec
+size 15622
diff --git a/vhba-signal.diff b/vhba-signal.diff
deleted file mode 100644
index e8afacf..0000000
--- a/vhba-signal.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2017-05-18 00:18:13.674608963 +0200
-
-build: resolve build failure with Linux 4.11+
-
-vhba.c:711:13: error: implicit declaration of function 'signal_pending' [-Werror=implicit-function-declaration]
-   if (signal_pending(current)) {
----
- vhba.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-Index: vhba-module-20161009/vhba.c
-===================================================================
---- vhba-module-20161009.orig/vhba.c
-+++ vhba-module-20161009/vhba.c
-@@ -28,6 +28,9 @@
- #include <linux/poll.h>
- #include <linux/slab.h>
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#	include <linux/sched/signal.h>
-+#endif
- #ifdef CONFIG_COMPAT
- #include <linux/compat.h>
- #endif