diff --git a/py4j-Base64-java8.patch b/py4j-Base64-java8.patch
index e924111..6299a78 100644
--- a/py4j-Base64-java8.patch
+++ b/py4j-Base64-java8.patch
@@ -45,3 +45,22 @@
  		assertArrayEquals(bytes, bytes2);
  
  		Gateway g = new Gateway(null);
+--- a/py4j-java/src/main/java/py4j/GatewayServer.java	2018-07-15 21:58:36.865238048 +0200
++++ b/py4j-java/src/main/java/py4j/GatewayServer.java	2018-07-15 21:58:57.879966196 +0200
+@@ -40,6 +40,7 @@
+ import java.nio.charset.Charset;
+ import java.security.SecureRandom;
+ import java.util.ArrayList;
++import java.util.Base64;
+ import java.util.Collections;
+ import java.util.List;
+ import java.util.concurrent.CopyOnWriteArrayList;
+@@ -847,7 +848,7 @@
+ 			SecureRandom rnd = new SecureRandom();
+ 			byte[] token = new byte[256 / Byte.SIZE];
+ 			rnd.nextBytes(token);
+-			authToken = Base64.encodeToString(token, false);
++			authToken = Base64.getEncoder().encodeToString(token);
+ 		}
+ 
+ 		GatewayServer gatewayServer = new GatewayServerBuilder().javaPort(port).authToken(authToken).build();
diff --git a/py4j.spec b/py4j.spec
index 52a8a90..901d0e5 100644
--- a/py4j.spec
+++ b/py4j.spec
@@ -24,7 +24,6 @@ URL:            http://%{name}.sf.net
 Source0:        https://github.com/bartdag/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-add-hamcrest-in-classpath.patch
 Patch1:         %{name}-Base64-java8.patch
-Patch2:         %{name}-Base64-java7.patch
 
 BuildArch:      noarch
 
@@ -160,11 +159,7 @@ sed -i -r "s|(<javadoc.*classpath=)\"\"|\1\"$(build-classpath junit)\"|" %{name}
 # unbundle MiGBase64, https://fedorahosted.org/fpc/ticket/537
 rm %{name}-java/src/main/java/%{name}/Base64.java
 rm %{name}-java/src/test/java/%{name}/Base64Test.java
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %patch1 -p1
-%else
-%patch2 -p1
-%endif
 
 %if %{with test_java}
 # prevent wrong exception warnings
@@ -311,8 +306,10 @@ fi
 
 
 %changelog
-* Fri Jul 13 2018 Raphael Groner <projects.rg@smart.ms> - 0.10.7-1
+* Sun Jul 15 2018 Raphael Groner <projects.rg@smart.ms> - 0.10.7-1
 - new version
+- adjust patch for Base64 replacement
+- drop support for java 7
 
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.10.6-5
 - Rebuilt for Python 3.7