diff --git a/xmlgraphics-batik.changes b/xmlgraphics-batik.changes
index 76dbbad..d8d4352 100644
--- a/xmlgraphics-batik.changes
+++ b/xmlgraphics-batik.changes
@@ -6,7 +6,10 @@ Thu Feb 29 07:18:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
   of javapackages-local
 - Require the xmlgraphics-commons, xml-commons-apis a rhino by their
   names, since they are on the classpath by their location in the
-  scripts
+  scripts. Require them in the subpackages that contain the scripts.
+- Require javapackages-tools in subpackages that contain scripts
+  created by jpackage_script macro. The scripts need functions from
+  javapackages tools
 
 -------------------------------------------------------------------
 Wed Feb 21 10:55:53 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
diff --git a/xmlgraphics-batik.spec b/xmlgraphics-batik.spec
index c69c7ce..987e150 100644
--- a/xmlgraphics-batik.spec
+++ b/xmlgraphics-batik.spec
@@ -41,9 +41,6 @@ BuildRequires:  rhino >= 1.6
 BuildRequires:  xml-commons-apis >= 1.3.03
 BuildRequires:  xmlgraphics-commons
 Requires:       %{name}-css = %{version}-%{release}
-Requires:       rhino
-Requires:       xml-commons-apis
-Requires:       xmlgraphics-commons
 Obsoletes:      batik < %{version}-%{release}
 Provides:       batik = %{version}-%{release}
 BuildArch:      noarch
@@ -67,6 +64,10 @@ CSS component of the Apache Batik SVG manipulation and rendering library.
 Summary:        Batik SVG browser
 Group:          Productivity/Graphics/Vector Editors
 Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-tools
+Requires:       rhino
+Requires:       xml-commons-apis
+Requires:       xmlgraphics-commons
 Obsoletes:      batik-squiggle < %{version}-%{release}
 Provides:       batik-squiggle = %{version}-%{release}
 
@@ -78,6 +79,10 @@ in the content and select text items in the image and much more.
 Summary:        Batik SVG pretty printer
 Group:          Productivity/Graphics/Vector Editors
 Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-tools
+Requires:       rhino
+Requires:       xml-commons-apis
+Requires:       xmlgraphics-commons
 Obsoletes:      batik-svgpp < %{version}-%{release}
 Provides:       batik-svgpp = %{version}-%{release}
 
@@ -90,6 +95,10 @@ also be used to modify the DOCTYPE declaration on SVG files.
 Summary:        Batik SVG font converter
 Group:          Productivity/Graphics/Vector Editors
 Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-tools
+Requires:       rhino
+Requires:       xml-commons-apis
+Requires:       xmlgraphics-commons
 Obsoletes:      batik-ttf2svg < %{version}-%{release}
 Provides:       batik-ttf2svg = %{version}-%{release}
 
@@ -103,6 +112,10 @@ rendered exactly the same on all systems.
 Summary:        Batik SVG rasterizer
 Group:          Productivity/Graphics/Vector Editors
 Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-tools
+Requires:       rhino
+Requires:       xml-commons-apis
+Requires:       xmlgraphics-commons
 Obsoletes:      batik-rasterizer < %{version}-%{release}
 Provides:       batik-rasterizer = %{version}-%{release}
 
@@ -117,6 +130,10 @@ to be added easily.
 Summary:        Batik SVG slideshow
 Group:          Productivity/Graphics/Vector Editors
 Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-tools
+Requires:       rhino
+Requires:       xml-commons-apis
+Requires:       xmlgraphics-commons
 Obsoletes:      batik-slideshow < %{version}-%{release}
 Provides:       batik-slideshow = %{version}-%{release}