diff --git a/steps/perl-5.8.9/pass1.sh b/steps/perl-5.8.9/pass1.sh
index 29564c39..964b885f 100755
--- a/steps/perl-5.8.9/pass1.sh
+++ b/steps/perl-5.8.9/pass1.sh
@@ -5,8 +5,7 @@
 src_prepare() {
     default
 
-    # no idea why this is needed
-    sed -i "s/Sigjmp_buf/sigjmp_buf/" cop.h
+    mv ../Digest-SHA-6.04 ext/Digest/SHA/
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary lib/unicore/mktables.lst \
@@ -37,11 +36,11 @@ src_prepare() {
 
     # Regenerate other prebuilt header files
     # Taken from headers of regen scripts
-    rm -f lib/warnings.pm warnings.h regnodes.h reentr.h reentr.c reentr.inc \
+    rm lib/warnings.pm warnings.h regnodes.h reentr.h reentr.c reentr.inc \
           overload.h overload.c opcode.h opnames.h pp_proto.h \
           pp.sym keywords.h embed.h embedvar.h global.sym perlapi.c perlapi.h \
-          proto.h lib/overload/numbers.pm pod/perlintern.pod pod/perlapi.pod \
-          pod/perlmodlib.pod perl/perltoc.pod ext/ByteLoader/byterun.{h,c} \
+          proto.h pod/perlintern.pod pod/perlapi.pod \
+          pod/perlmodlib.pod ext/ByteLoader/byterun.{h,c} \
           ext/B/B/Asmdata.pm
     perl regen.pl
 
@@ -66,7 +65,6 @@ src_configure() {
     ./Configure -des \
         -Dprefix="${PREFIX}" \
         -Dcc=gcc \
-        -Dyacc='bison -y' \
         -Dusedl=false \
         -Ddate=':' \
         -Dccflags="-U__DATE__ -U__TIME__" \
@@ -75,6 +73,14 @@ src_configure() {
         -Dmaildomain="(none)"
 }
 
+src_compile() {
+    pushd x2p
+    make BYACC=yacc run_byacc
+    popd
+
+    make -j1 PREFIX="${PREFIX}"
+}
+
 src_install() {
     default
 
diff --git a/steps/perl-5.8.9/patches/a2p-c-bison.patch b/steps/perl-5.8.9/patches/a2p-c-bison.patch
new file mode 100644
index 00000000..009f1c23
--- /dev/null
+++ b/steps/perl-5.8.9/patches/a2p-c-bison.patch
@@ -0,0 +1,11 @@
+--- perl-5.8.9/x2p/Makefile.SH	2025-07-17 18:07:55.350717970 +1000
++++ perl-5.8.9/x2p/Makefile.SH	2025-07-17 18:09:02.340711269 +1000
+@@ -123,7 +123,7 @@
+ 	sed -e 's/(yyn = yydefred\[yystate\])/((yyn = yydefred[yystate]))/' \
+ 	    -e 's/(yys = getenv("YYDEBUG"))/((yys = getenv("YYDEBUG")))/' \
+ 	    -e 's/^yyerrlab://' \
+-	    -e 's/^    goto yyerrlab;//' \
++	    -e 's/^ *goto yyerrlab;//' \
+ 	    -e 's/^yynewerror://' \
+ 	    -e 's/^    goto yynewerror;//' \
+ 	    -e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
diff --git a/steps/perl-5.8.9/sources b/steps/perl-5.8.9/sources
index 1c6f0a10..2f51484e 100644
--- a/steps/perl-5.8.9/sources
+++ b/steps/perl-5.8.9/sources
@@ -1,2 +1,3 @@
 https://www.cpan.org/src/5.0/perl-5.8.9.tar.bz2 1097fbcd48ceccb2bc735d119c9db399a02a8ab9f7dc53e29e47e6a8d0d72e79
 git://github.com/Perl/metaconfig~40501436c87602cc17baae64ee6b3ca26d74e354 https://github.com/Perl/metaconfig/archive/40501436c87602cc17baae64ee6b3ca26d74e354.tar.gz 6b0c937e1aaef684a7b2f0c089bea293c7a9d255d6513e5108567f4c10e3f4dd
+https://cpan.metacpan.org/authors/id/M/MS/MSHELOR/Digest-SHA-6.04.tar.gz ee91f8f7db894ee7c6ee003daac10a99056c4948a674ef46acdbb63c81a4abeb