diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
index 2c68edbb8..cf83778b1 100644
--- a/steps/SHA256SUMS.pkgs
+++ b/steps/SHA256SUMS.pkgs
@@ -96,7 +96,7 @@ f25c410403bef549d4ba37e500970480eaa649b582db9de9e21616257f9ecbcf  musl-1.2.5_1.t
 3755dc16bfa1ff39a1c9309c2c03bb0e5dfc215ae4b1c242f3818fe07c1014e4  musl-1.2.5_2.tar.bz2
 62d3091f09315ef0c01865d15068ee14e19a04bdb40c23f5490a01aa23dd5565  opendoas-6.8.2_0.tar.bz2
 c23cc2088428586f594888159486800e7028b09e9f61d4a0d5ddf5d8f8fbab66  openssl-3.6.0_0.tar.bz2
-a69d77242ba2bfa97a40e633656703ecedbcd797de5ad29eb62bf93831ee6f25  patch-2.7.6_0.tar.bz2
+fe460b1f4a5a7fc6bbcfa2ec0197eb4d5d2ad089a2c59a21000384cd429716e6  patch-2.8_0.tar.bz2
 44456a0635dc56351d34bf9701487e562c2c903393db2cc99f5c3a6d2ecf52d4  perl-5.000_0.tar.bz2
 0b7ded1733433323c2056b1005828aaabb8aaca9505839333a8e80f12669f203  perl-5.003_0.tar.bz2
 e8707f598b909ae01a5dc480fc9867ddb6254d22538f8f6cb65734294d92d728  perl5.004-05_0.tar.bz2
diff --git a/steps/manifest b/steps/manifest
index 68c36ad6c..4d7d7d532 100644
--- a/steps/manifest
+++ b/steps/manifest
@@ -190,7 +190,7 @@ build: libarchive-3.5.2
 build: openssl-3.6.0
 build: ca-certificates-3.119.1
 build: curl-8.17.0
-build: patch-2.7.6
+build: patch-2.8
 build: gettext-0.21
 build: texinfo-6.7
 build: gcc-4.7.4
diff --git a/steps/patch-2.7.6/import-gnulib.sh b/steps/patch-2.7.6/import-gnulib.sh
deleted file mode 100755
index b199cf975..000000000
--- a/steps/patch-2.7.6/import-gnulib.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-../gnulib-e017871/gnulib-tool --import \
-    --local-dir=gl \
-    --lib=libpatch \
-    --source-base=lib \
-    --m4-base=m4 \
-    --doc-base=doc \
-    --tests-base=tests \
-    --aux-dir=build-aux \
-    --makefile-name=gnulib.mk \
-    --no-conditional-dependencies \
-    --no-libtool \
-    --macro-prefix=gl \
-    argmatch \
-    backupfile \
-    clock-time \
-    diffseq \
-    dirname \
-    dup2 \
-    errno \
-    exitfail \
-    extensions \
-    faccessat \
-    fchmodat \
-    fchownat \
-    fcntl-h \
-    fstatat \
-    full-write \
-    getdate \
-    getopt-gnu \
-    gettime \
-    git-version-gen \
-    gitlog-to-changelog \
-    gnupload \
-    hash \
-    ignore-value \
-    intprops \
-    largefile \
-    linked-list \
-    maintainer-makefile \
-    malloc \
-    manywarnings \
-    memchr \
-    minmax \
-    mkdirat \
-    nstrftime \
-    openat \
-    progname \
-    quotearg \
-    readlinkat \
-    realloc \
-    renameat \
-    setenv \
-    signal \
-    size_max \
-    ssize_t \
-    stat-time \
-    stdbool \
-    stdlib \
-    symlinkat \
-    sys_stat \
-    tempname \
-    time \
-    unistd \
-    unlinkat \
-    update-copyright \
-    utimensat \
-    verror \
-    xalloc \
-    xlist \
-    xmemdup0
diff --git a/steps/patch-2.7.6/sources b/steps/patch-2.7.6/sources
deleted file mode 100644
index 4f8427c7c..000000000
--- a/steps/patch-2.7.6/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-f https://mirrors.kernel.org/gnu/patch/patch-2.7.6.tar.xz ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd
-g https://https.git.savannah.gnu.org/git/gnulib.git~e017871 _ a285dc300c3d9c25cc06e38827ef40f6073ec3b9b0fcb5bba433f943be92d8d4 gnulib-e017871.tar.gz
diff --git a/steps/patch-2.8/import-gnulib.sh b/steps/patch-2.8/import-gnulib.sh
new file mode 100755
index 000000000..b48ab32ba
--- /dev/null
+++ b/steps/patch-2.8/import-gnulib.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Regenerate unicode files
+pushd ../gnulib-9829f0a/lib
+gcc -Iunictype -o gen-uni-tables gen-uni-tables.c
+mv ../../*.txt .
+./gen-uni-tables UnicodeData-16.0.0.txt \
+    PropList-16.0.0.txt \
+    DerivedCoreProperties-16.0.0.txt \
+    ArabicShaping-16.0.0.txt \
+    Scripts-16.0.0.txt \
+    Blocks-16.0.0.txt \
+    PropList-3.0.1.txt \
+    EastAsianWidth-16.0.0.txt \
+    LineBreak-16.0.0.txt \
+    WordBreakProperty-16.0.0.txt \
+    GraphemeBreakProperty-16.0.0.txt \
+    CompositionExclusions-16.0.0.txt \
+    SpecialCasing-16.0.0.txt \
+    CaseFolding-16.0.0.txt \
+    16.0.0
+popd
+
+../gnulib-9829f0a/gnulib-tool --import \
+ --local-dir=gl \
+ --lib=libpatch \
+ --source-base=lib \
+ --m4-base=m4 \
+ --doc-base=doc \
+ --tests-base=tests \
+ --aux-dir=build-aux \
+ --no-conditional-dependencies \
+ --no-libtool \
+ --macro-prefix=gl \
+ announce-gen \
+ argmatch \
+ assert-h \
+ attribute \
+ backupfile \
+ basename-lgpl \
+ bool \
+ c-ctype \
+ closeout \
+ diffseq \
+ dup2 \
+ errno-h \
+ exitfail \
+ extensions \
+ faccessat \
+ fchmodat \
+ fchownat \
+ fcntl-h \
+ filename \
+ fseeko \
+ fstatat \
+ ftello \
+ futimens \
+ getopt-gnu \
+ gettime \
+ git-version-gen \
+ gitlog-to-changelog \
+ gnupload \
+ hash \
+ idx \
+ ignore-value \
+ intprops \
+ inttypes-h \
+ largefile \
+ maintainer-makefile \
+ malloc-gnu \
+ manywarnings \
+ memchr \
+ mempcpy \
+ minmax \
+ mkdirat \
+ nullptr \
+ openat \
+ parse-datetime \
+ progname \
+ quotearg \
+ raise \
+ readlinkat \
+ realloc-posix \
+ renameat \
+ setenv \
+ signal-h \
+ ssize_t \
+ stat-time \
+ stdckdint-h \
+ stdlib-h \
+ stpcpy \
+ symlinkat \
+ sys_stat-h \
+ tempname \
+ test-xfail \
+ unistd-h \
+ unlinkat \
+ update-copyright \
+ utimensat \
+ verror \
+ xalloc \
+ xstdopen \
+ year2038-recommended
diff --git a/steps/patch-2.7.6/pass1.sh b/steps/patch-2.8/pass1.sh
similarity index 92%
rename from steps/patch-2.7.6/pass1.sh
rename to steps/patch-2.8/pass1.sh
index e66036a7e..e45f666cc 100755
--- a/steps/patch-2.7.6/pass1.sh
+++ b/steps/patch-2.8/pass1.sh
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
+    rm lib/unictype/ctype_print.h
     ../../import-gnulib.sh
 
     # bison
diff --git a/steps/patch-2.8/sources b/steps/patch-2.8/sources
new file mode 100644
index 000000000..2a7e34fb8
--- /dev/null
+++ b/steps/patch-2.8/sources
@@ -0,0 +1,16 @@
+f https://mirrors.kernel.org/gnu/patch/patch-2.8.tar.xz f87cee69eec2b4fcbf60a396b030ad6aa3415f192aa5f7ee84cad5e11f7f5ae3
+g https://https.git.savannah.gnu.org/git/gnulib.git~9829f0a _ 377786991f43e21623fa5cbc0fd98f2d8fbe1f95e0d0cad3be9421efd86f39dd gnulib-9829f0a.tar.gz
+f http://ftp.unicode.org/Public/16.0.0/ucd/PropList.txt 53d614508e2a0b2305a8aa21cd60d993de9326cdf65993660dfcce4503548583 PropList-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/DerivedCoreProperties.txt 39d35161f2954497f69e08bdb9e701493f476a3d30222de20028feda36c1dabd DerivedCoreProperties-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/emoji/emoji-data.txt f1365a5173eee18e1f98b240cdc492e84a25f1ce7e0c9d1094eb29c41a22696a emoji-data-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/ArabicShaping.txt 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 ArabicShaping-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/Scripts.txt 9e88f0a677df47311106340be8ede2ecdacd9c1c931831218d2be6d5508e0039 Scripts-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/Blocks.txt f3907b395d410f1b97342292ca6bc83dd12eb4b205f2a0c48efdef99e517d7b0 Blocks-16.0.0.txt
+f http://ftp.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt 909eef4adbeddbdddcd9487c856fe8cdbb8912aa8eb315ed7885b6ef65f4dc4c
+f http://ftp.unicode.org/Public/16.0.0/ucd/EastAsianWidth.txt 43adc76c0686a42cb370764eb8cfe2b2a45b10b855e5572a2db4a0eecce15d5b EastAsianWidth-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/LineBreak.txt e97e4259d0d20fab150b9c7b4b28abfae5cd78ca97e7f4ac6ed20d685d5f4a7c LineBreak-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/auxiliary/WordBreakProperty.txt 476464e71a4b7b779b8ba7c5671f4338fea77da8e6b6b05fb82b3fdd14603779 WordBreakProperty-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/auxiliary/GraphemeBreakProperty.txt c29360bd6f7132811d701d29069541e827eb44bfc4c8fbde8c370d6982689dc1 GraphemeBreakProperty-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/CompositionExclusions.txt 89e83cf9cc8bef6c1f8bf77e42cf6f0341dfa42e66261f4dbe9b492e7a23c8ee CompositionExclusions-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/SpecialCasing.txt 8d5de354eef79f2395a54c9c7dcebbaf3d30fc962d0f85611ea97aa973a0c451 SpecialCasing-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/CaseFolding.txt 6f1f9c588eb4a5c718d9e8f93b782685e5c7fec872cf05e8e6878053599e09bb CaseFolding-16.0.0.txt