diff --git a/steps/perl-5.24.4/pass1.sh b/steps/perl-5.24.4/pass1.sh
index 28490f57..b1d82ffd 100755
--- a/steps/perl-5.24.4/pass1.sh
+++ b/steps/perl-5.24.4/pass1.sh
@@ -3,6 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
+    # change unicode files to 5.30 version, in particular mktables
+    # This is required to have the necessary tables for 5.30 build
+    mv ../perl-5.30.3/lib/unicore/{version,mktables,*.txt} lib/unicore/
+    mv ../perl-5.30.3/lib/unicore/auxiliary/*.txt lib/unicore/auxiliary/
+    mv ../perl-5.30.3/lib/unicore/extracted/*.txt lib/unicore/extracted/
+
     default
 
     mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
diff --git a/steps/perl-5.24.4/patches/0001-Revert-regen-mk_PL_charclass.pl-Suppress-extra-null-.patch b/steps/perl-5.24.4/patches/0001-Revert-regen-mk_PL_charclass.pl-Suppress-extra-null-.patch
deleted file mode 100644
index e848a307..00000000
--- a/steps/perl-5.24.4/patches/0001-Revert-regen-mk_PL_charclass.pl-Suppress-extra-null-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-SPDX-FileCopyrightText: 2015 Karl Williamson <public@khwilliamson.com>
-SPDX-FileCopyrightText: 2025 fosslinux <fosslinux@aussies.space>
-
-SPDX-License-Identifier: Artistic-1.0
-
-This commit does not affect correctness of the script, and negative indexes are
-not supported in Perl 5.22.
-
-From c5ea74f1efd612cda79d6ba3cb1430afdc2ab970 Mon Sep 17 00:00:00 2001
-From: Samuel Tyler <fosslinux@aussies.space>
-Date: Sun, 31 Aug 2025 12:21:46 +1000
-Subject: [PATCH] Revert "regen/mk_PL_charclass.pl: Suppress extra null array
- element"
-
-This reverts commit e8368231412c57222c53c0dc1fac7f711fa051e2.
----
- regen/mk_PL_charclass.pl | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git perl-5.24.4/regen/mk_PL_charclass.pl perl-5.24.4/regen/mk_PL_charclass.pl
-index 5b609e530b..0bee1ac2a0 100644
---- perl-5.24.4/regen/mk_PL_charclass.pl
-+++ perl-5.24.4/regen/mk_PL_charclass.pl
-@@ -384,8 +384,6 @@ foreach my $charset (get_supported_code_pages()) {
- 
-         $out[$index] .= ",\n";
-     }
--    $out[-1] =~ s/,$//;     # No trailing comma in the final entry
--
-     print $out_fh join "", @out;
-     print $out_fh "\n" . get_conditional_compile_line_end();
- }
--- 
-2.49.1
-
diff --git a/steps/perl-5.24.4/patches/0002-Revert-regen-regcharclass.pl-avoid-autoderef-feature.patch b/steps/perl-5.24.4/patches/Revert-regen-regcharclass.pl-avoid-autoderef-feature.patch
similarity index 100%
rename from steps/perl-5.24.4/patches/0002-Revert-regen-regcharclass.pl-avoid-autoderef-feature.patch
rename to steps/perl-5.24.4/patches/Revert-regen-regcharclass.pl-avoid-autoderef-feature.patch
diff --git a/steps/perl-5.24.4/patches/Unicode-UCD.pm-Add-undocumented-internal-feature.patch b/steps/perl-5.24.4/patches/Unicode-UCD.pm-Add-undocumented-internal-feature.patch
new file mode 100644
index 00000000..854e8340
--- /dev/null
+++ b/steps/perl-5.24.4/patches/Unicode-UCD.pm-Add-undocumented-internal-feature.patch
@@ -0,0 +1,35 @@
+From 00616fe6cbb2f183bdc8fa035d4730261733e732 Mon Sep 17 00:00:00 2001
+From: Karl Williamson <khw@cpan.org>
+Date: Sat, 23 Dec 2017 14:45:02 -0700
+Subject: [PATCH] Unicode::UCD.pm Add undocumented internal feature
+
+This allows charprop() to be called on a Perl-internal-only property
+---
+ lib/Unicode/UCD.pm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git perl-5.24.4/lib/Unicode/UCD.pm perl-5.24.4/lib/Unicode/UCD.pm
+index 13c2c78598..b5125bd506 100644
+--- perl-5.24.4/lib/Unicode/UCD.pm
++++ perl-5.24.4/lib/Unicode/UCD.pm
+@@ -694,14 +694,14 @@ that are internal-only.
+ 
+ =cut
+ 
+-sub charprop ($$) {
+-    my ($input_cp, $prop) = @_;
++sub charprop ($$;$) {
++    my ($input_cp, $prop, $internal_ok) = @_;
+ 
+     my $cp = _getcode($input_cp);
+     croak __PACKAGE__, "::charprop: unknown code point '$input_cp'" unless defined $cp;
+ 
+     my ($list_ref, $map_ref, $format, $default)
+-                                      = prop_invmap($prop);
++                                      = prop_invmap($prop, $internal_ok);
+     return undef unless defined $list_ref;
+ 
+     my $i = search_invlist($list_ref, $cp);
+-- 
+2.49.1
+
diff --git a/steps/perl-5.24.4/sources b/steps/perl-5.24.4/sources
index 7c0c8c39..b637c921 100644
--- a/steps/perl-5.24.4/sources
+++ b/steps/perl-5.24.4/sources
@@ -1,2 +1,3 @@
 http://www.cpan.org/src/5.0/perl-5.24.4.tar.xz 7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84
+http://www.cpan.org/src/5.0/perl-5.30.3.tar.xz 6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4
 git://github.com/Perl/metaconfig~5.26.1 https://github.com/Perl/metaconfig/archive/5.26.1.tar.gz 4641f5127a55cf2e1e8f9253ec27fba10b5b77076b4163e7f4bdc7f670d1aaf0