diff --git a/SOURCES/0001-Adapt-mvn-script.patch b/SOURCES/0001-Adapt-mvn-script.patch
index 3b9b670..a05e573 100644
--- a/SOURCES/0001-Adapt-mvn-script.patch
+++ b/SOURCES/0001-Adapt-mvn-script.patch
@@ -1,14 +1,14 @@
-From 056c94f86450c7c27f5bb11f98653c73bfe3d8e4 Mon Sep 17 00:00:00 2001
+From 247eafd819d6092661ebc57c54815acd20abd3de Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Wed, 1 Feb 2017 14:54:26 +0100
 Subject: [PATCH 1/4] Adapt mvn script
 
 ---
- apache-maven/src/bin/mvn | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
+ apache-maven/src/bin/mvn | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index a554c6617..0c07ba6e2 100755
+index a554c6617..739501af4 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
 @@ -22,7 +22,7 @@
@@ -20,13 +20,11 @@ index a554c6617..0c07ba6e2 100755
  #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is executed.
  #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
  # -----------------------------------------------------------------------------
-@@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
+@@ -33,12 +33,16 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
      . /etc/mavenrc
    fi
  
-+  if [ -f /etc/java/maven.conf ] ; then
-+    . /etc/java/maven.conf
-+  fi
++  . /etc/java/maven.conf
 +
    if [ -f "$HOME/.mavenrc" ] ; then
      . "$HOME/.mavenrc"
@@ -34,18 +32,12 @@ index a554c6617..0c07ba6e2 100755
  
  fi
  
-+if [ -f /usr/share/java-utils/java-functions ] ; then
-+  . /usr/share/java-utils/java-functions
-+  set_jvm
-+  set_javacmd
-+fi
 +export JAVA_HOME
-+export JAVACMD
 +
  # OS specific support. $var _must_ be set to either true or false.
  cygwin=false;
  mingw=false;
-@@ -63,7 +75,8 @@ done
+@@ -63,7 +67,8 @@ done
  
  saveddir=`pwd`
  
diff --git a/SPECS/maven.spec b/SPECS/maven.spec
index 1acaf4b..cba252e 100644
--- a/SPECS/maven.spec
+++ b/SPECS/maven.spec
@@ -5,7 +5,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -85,10 +85,6 @@ Requires(post): chkconfig
 Requires(postun): chkconfig
 %endif
 
-# Require full javapackages-tools since maven-script uses
-# /usr/share/java-utils/java-functions
-Requires: javapackages-tools
-
 %if 0%{?module_prefix:1}
 %description -n %{module_prefix}%{name}
 %{summary}.
@@ -285,6 +281,9 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 
 
 %changelog
+* Wed May 20 2020 Marian Koncek <mkoncek@redhat.com> - 1:3.6.2-5
+- Drop dependency on javapackages-tools
+
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-4
 - Build with OpenJDK 8
 - Implement JDK bindings