diff --git a/0001-Double-quote-to-avoid-substitution-during-build.patch b/0001-Double-quote-to-avoid-substitution-during-build.patch
new file mode 100644
index 0000000..f9d3d1a
--- /dev/null
+++ b/0001-Double-quote-to-avoid-substitution-during-build.patch
@@ -0,0 +1,25 @@
+From 5ede44f34a30011908b7dfc911d9c9bc270f1abc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Thu, 3 Oct 2024 11:21:43 +0200
+Subject: [PATCH] Double-quote to avoid substitution during build
+
+---
+ macros.d/macros.jpackage | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
+index adfff436..55d4ba94 100644
+--- a/macros.d/macros.jpackage
++++ b/macros.d/macros.jpackage
+@@ -37,7 +37,7 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \
+ # JPackage Project <http://www.jpackage.org/>\
+ \
+ # 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\
+-- 
+2.46.1
+
diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 5cb1b23..e03b9ea 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -32,6 +32,10 @@ Wed Oct  2 17:27:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
   * 0007-Test-that-we-don-t-bomb-on-relativePath.patch
   * 0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch
     + Integrated in this version
+- Added patch:
+  * 0001-Double-quote-to-avoid-substitution-during-build.patch
+    + Double-quote a macro in macros.jpackages to avoid value
+      substitution during the build
 
 -------------------------------------------------------------------
 Thu Jul 18 12:15:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index a98202d..0c668d7 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -45,6 +45,7 @@ Patch1:         python-optional.patch
 #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did
 #               Avoid generating unresolvable requires
 Patch2:         suse-no-epoch.patch
+Patch3:         0001-Double-quote-to-avoid-substitution-during-build.patch
 
 BuildRequires:  fdupes
 BuildRequires:  perl