diff --git a/javapackages-tools-extras.changes b/javapackages-tools-extras.changes
index 4d48c2a..d0bfe99 100644
--- a/javapackages-tools-extras.changes
+++ b/javapackages-tools-extras.changes
@@ -3,6 +3,8 @@ Thu May 18 20:11:39 UTC 2017 - tchvatal@suse.com
 
 - Split to python and non-python edition for smaller depgraph
 - Add patch python-optional.patch
+- Fix abs2rel shebang:
+  * fix-abs2rel.patch
 
 -------------------------------------------------------------------
 Thu May 18 19:40:26 UTC 2017 - tchvatal@suse.com
diff --git a/javapackages-tools-extras.spec b/javapackages-tools-extras.spec
index 439a3a0..c9b33ce 100644
--- a/javapackages-tools-extras.spec
+++ b/javapackages-tools-extras.spec
@@ -31,6 +31,8 @@ Source:         javapackages-%{version}.tar.xz
 Patch0:         suse-use-libdir.patch
 #PATCH-FIX-SUSE: allow building without python to reduce depgraph
 Patch1:         python-optional.patch
+#PATCH-FIX-UPSTREAM: use proper expansion for shebang
+Patch2:         fix-abs2rel.patch
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  rpm
@@ -109,7 +111,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %build
 %configure \
 %if %{with python}
-    --pyinterpreter=python3
+    --pyinterpreter=/usr/bin/python3
 %else
     --pyinterpreter=%{nil}
 %endif
diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 4d48c2a..d0bfe99 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -3,6 +3,8 @@ Thu May 18 20:11:39 UTC 2017 - tchvatal@suse.com
 
 - Split to python and non-python edition for smaller depgraph
 - Add patch python-optional.patch
+- Fix abs2rel shebang:
+  * fix-abs2rel.patch
 
 -------------------------------------------------------------------
 Thu May 18 19:40:26 UTC 2017 - tchvatal@suse.com
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 395f041..c033a44 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -31,6 +31,8 @@ Source:         javapackages-%{version}.tar.xz
 Patch0:         suse-use-libdir.patch
 #PATCH-FIX-SUSE: allow building without python to reduce depgraph
 Patch1:         python-optional.patch
+#PATCH-FIX-UPSTREAM: use proper expansion for shebang
+Patch2:         fix-abs2rel.patch
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  rpm
@@ -109,7 +111,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %build
 %configure \
 %if %{with python}
-    --pyinterpreter=python3
+    --pyinterpreter=/usr/bin/python3
 %else
     --pyinterpreter=%{nil}
 %endif