diff --git a/docker-client-so-linger.patch b/docker-client-so-linger.patch
deleted file mode 100644
index 372ee91..0000000
--- a/docker-client-so-linger.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5dd60622ba3754e6c526ee0a69dd20c282738d74 Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber@redhat.com>
-Date: Fri, 10 Jul 2015 14:22:14 -0400
-Subject: [PATCH] Implement SO_LINGER.
-
-Apache httpcpomponents-core 4.4 calls setSoLinger.
----
- .../java/com/spotify/docker/client/ApacheUnixSocket.java  | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git src/main/java/com/spotify/docker/client/ApacheUnixSocket.java src/main/java/com/spotify/docker/client/ApacheUnixSocket.java
-index 851ed1c..5a45234 100644
---- src/main/java/com/spotify/docker/client/ApacheUnixSocket.java
-+++ src/main/java/com/spotify/docker/client/ApacheUnixSocket.java
-@@ -48,6 +48,7 @@ public class ApacheUnixSocket extends Socket {
- 
-   private final UnixSocketChannel inner;
-   private SocketAddress addr;
-+  private int lingerTime;
- 
-   private final Queue<SocketOptionSetter> optionsToSet = Queues.newArrayDeque();
- 
-@@ -162,12 +163,14 @@ public class ApacheUnixSocket extends Socket {
- 
-   @Override
-   public void setSoLinger(final boolean on, final int linger) throws SocketException {
--    throw new UnsupportedOperationException("Unimplemented");
-+    if (on) {
-+      lingerTime = linger;
-+    }
-   }
- 
-   @Override
-   public int getSoLinger() throws SocketException {
--    throw new UnsupportedOperationException("Unimplemented");
-+    return lingerTime;
-   }
- 
-   @Override
-@@ -257,6 +260,14 @@ public class ApacheUnixSocket extends Socket {
- 
-   @Override
-   public synchronized void close() throws IOException {
-+    if (lingerTime > 0) {
-+      try {
-+        Thread.sleep(lingerTime * 1000);
-+      } catch (InterruptedException e) {
-+      }
-+    }
-+    shutdownInput();
-+    shutdownOutput();
-     inner.close();
-   }
- 
--- 
-2.1.0
-
diff --git a/docker-client.spec b/docker-client.spec
index a9f9a33..7d4541c 100644
--- a/docker-client.spec
+++ b/docker-client.spec
@@ -2,7 +2,7 @@
 %{!?scl:%global pkg_name %{name}}
 
 Name:           %{?scl_prefix}docker-client
-Version:        3.1.9
+Version:        3.5.9
 Release:        1%{?dist}
 Summary:        Docker Client
 
@@ -11,10 +11,10 @@ URL:            https://github.com/spotify/docker-client
 Source0:        https://github.com/spotify/docker-client/archive/v%{version}.tar.gz
 
 Patch0:         add-manifest.patch
-# Apache httpcomponents-core >= 4.4 calls setSoLinger
-Patch2:         %{pkg_name}-so-linger.patch
 
 BuildRequires: maven-local
+BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
+BuildRequires: mvn(org.jacoco:jacoco-maven-plugin)
 BuildRequires: %{?scl_prefix}apache-commons-compress >= 1.9
 BuildRequires: %{?scl_prefix}bouncycastle-pkix >= 1.50
 BuildRequires: %{?scl_prefix}glassfish-hk2-utils >= 2.4.0-0.4.b24
@@ -47,7 +47,6 @@ The Docker Client is a Java API library for accessing a Docker daemon.
 %prep
 %setup -q -n docker-client-%{version}
 %patch0
-%patch2
 %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
 %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
 %pom_remove_plugin org.apache.maven.plugins:maven-shade-plugin
@@ -64,6 +63,9 @@ export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/E
 %doc NOTICE README.md
 
 %changelog
+* Wed Jan 20 2016 Alexander Kurtakov <akurtako@redhat.com> 3.5.9-1
+- Update to upstream 3.5.9 release.
+
 * Fri Oct 23 2015 Alexander Kurtakov <akurtako@redhat.com> 3.1.9-1
 - Update to upstream 3.1.9 release.
 
diff --git a/sources b/sources
index 3d26a96..2924e5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8e15372d0d5c11eb249fd5b0b69d294  v3.1.9.tar.gz
+b8329f935975a949d262d0e1cbb05a91  v3.5.9.tar.gz