diff --git a/fix-broken-commands.patch b/fix-broken-commands.patch
new file mode 100644
index 0000000..af30a1f
--- /dev/null
+++ b/fix-broken-commands.patch
@@ -0,0 +1,18 @@
+--- a/macros.d/macros.jpackage
++++ b/macros.d/macros.jpackage
+@@ -10,11 +10,11 @@
+ #==============================================================================
+ # ---- default Java commands
+ 
+-%ant            %{?jpb_env} JAVA_HOME=%{java_home} ant
+-%jar            %{java_home}/bin/jar
++%ant            %{?jpb_env} ant
++%jar            jar
+ %java           %(. @{javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)
+-%javac          %{java_home}/bin/javac
+-%javadoc        %{java_home}/bin/javadoc
++%javac          javac
++%javadoc        javadoc
+ 
+ 
+ #
diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 873a72a..8f8e2dc 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct  9 07:27:42 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- remove-pointless-assignment.patch: Remove pointless assignment if
+  %java_home is unset
+
+-------------------------------------------------------------------
+Tue Oct  8 22:48:45 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * fix-broken-commands.patch
+    + fix commands broken after recent removal of the default
+      %%{java_home} macro
+
 -------------------------------------------------------------------
 Mon Oct  7 17:38:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 6ba591b..9d52aa7 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -48,6 +48,10 @@ Patch2:         suse-no-epoch.patch
 #
 #PATCH-FIX-UPSTREAM: do not fail if which does not exist
 Patch3:         do-not-require-which.patch
+#PATCH-FIX-UPSTREAM: fix broken %%ant, %%jar, %%javadoc and %%javac commands
+Patch4:         fix-broken-commands.patch
+#PATCH-FIX-UPSTREAM Remove pointless assignment if %%java_home is unset
+Patch5:         remove-pointless-assignment.patch
 
 BuildRequires:  fdupes
 BuildRequires:  perl
diff --git a/remove-pointless-assignment.patch b/remove-pointless-assignment.patch
new file mode 100644
index 0000000..a76c290
--- /dev/null
+++ b/remove-pointless-assignment.patch
@@ -0,0 +1,18 @@
+Index: javapackages-6.3.2/macros.d/macros.jpackage
+===================================================================
+--- javapackages-6.3.2.orig/macros.d/macros.jpackage
++++ javapackages-6.3.2/macros.d/macros.jpackage
+@@ -35,10 +35,10 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \
+ #\
+ # %{name} script\
+ # JPackage Project <http://www.jpackage.org/>\
+-\
++%{?java_home:\
+ # Set default JAVA_HOME\
+-export JAVA_HOME="\\${JAVA_HOME:-%{?java_home}}"\
+-\
++export JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\
++}\
+ # Source functions library\
+ . @{javadir}-utils/java-functions\
+ \