diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index fdc0449..93b035c 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -3,7 +3,7 @@
 
 Name:           %{?scl_prefix}eclipse-linuxtools
 Version:        4.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Linux specific Eclipse plugins
 
 License:        EPL
@@ -198,6 +198,21 @@ sed -i 's/javax.ws.rs/javax.ws.rs-api/' containers/org.eclipse.linuxtools.docker
 sed -i -e '9i\ javax.annotation-api;bundle-version="1.2.0",' \
 containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
 
+# Support docker-client 3.5.9
+for f in `find containers/org.eclipse.linuxtools.docker.core -name "*.java"`; do
+  sed -i 's|BuildParameter|BuildParam|g
+          s|LogsParameter|LogsParam|g
+          s|BuildParam\.FORCE_RM|BuildParam\.forceRm()|g
+          s|BuildParam\.QUIET|BuildParam\.quiet()|g
+          s|BuildParam\.NO_CACHE|BuildParam\.noCache()|g
+          s|BuildParam\.NO_RM|BuildParam\.rm(false)|g
+          s|LogsParam\.FOLLOW|LogsParam\.follow()|g
+          s|LogsParam\.STDOUT|LogsParam\.stdout()|g
+          s|LogsParam\.STDERR|LogsParam\.stderr()|g
+          s|LogsParam\.TIMESTAMPS|LogsParam\.timestamps()|g
+          ' $f
+done
+
 %mvn_package ":*.{test,tests}" linuxtools-tests
 %mvn_package ":*.tests.hamcrest-wrap" linuxtools-tests
 %mvn_package ":org.eclipse.linuxtools.docker*" docker
@@ -287,6 +302,9 @@ install -D -m 755 eclipse-runLinuxToolsTestBundles %{buildroot}%{_bindir}/eclips
 %{_bindir}/eclipse-runLinuxToolsTestBundles
 
 %changelog
+* Wed Jan 20 2016 Roland Grunberg <rgrunber@redhat.com> - 4.2.0-3
+- Support docker-client 3.5.9.
+
 * Thu Dec 17 2015 Mat Booth <mat.booth@redhat.com> - 4.2.0-2
 - Add requirement on vagrant for vagrant tooling.