diff --git a/steps/coreutils-6.10/import-gnulib.sh b/steps/coreutils-6.10/import-gnulib.sh
new file mode 100644
index 00000000..da8362dd
--- /dev/null
+++ b/steps/coreutils-6.10/import-gnulib.sh
@@ -0,0 +1,205 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2025 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+../gnulib-1533e65/gnulib-tool --import \
+ --dir=. \
+ --local-dir=gl \
+ --lib=libcoreutils \
+ --source-base=lib \
+ --m4-base=m4 \
+ --doc-base=doc \
+ --aux-dir=build-aux \
+ --with-tests \
+ --avoid=canonicalize-lgpl \
+ --avoid=lock \
+ --no-libtool \
+ --macro-prefix=gl \
+ acl \
+ alloca \
+ announce-gen \
+ areadlink-with-size \
+ argmatch \
+ assert \
+ atexit \
+ autobuild \
+ backupfile \
+ base64 \
+ c-strcase \
+ c-strtod \
+ c-strtold \
+ calloc \
+ canon-host \
+ canonicalize \
+ chown \
+ cloexec \
+ closein \
+ closeout \
+ config-h \
+ configmake \
+ crypto/md5 \
+ crypto/sha1 \
+ cycle-check \
+ d-ino \
+ d-type \
+ diacrit \
+ dirfd \
+ dirname \
+ dup2 \
+ error \
+ euidaccess \
+ exclude \
+ exitfail \
+ fchdir \
+ fcntl \
+ fcntl-safer \
+ fdl \
+ file-type \
+ fileblocks \
+ filemode \
+ filenamecat \
+ fnmatch-gnu \
+ fopen-safer \
+ fprintftime \
+ free \
+ fseeko \
+ fsusage \
+ ftello \
+ ftruncate \
+ fts \
+ getdate \
+ getgroups \
+ gethrxtime \
+ getline \
+ getloadavg \
+ getndelim2 \
+ getopt \
+ getpagesize \
+ getpass-gnu \
+ gettext \
+ gettime \
+ gettimeofday \
+ getugroups \
+ getusershell \
+ git-version-gen \
+ gnu-make \
+ gnupload \
+ group-member \
+ hard-locale \
+ hash \
+ hash-pjw \
+ host-os \
+ human \
+ idcache \
+ inttostr \
+ inttypes \
+ isapipe \
+ lchmod \
+ lchown \
+ lib-ignore \
+ linebuffer \
+ link-follow \
+ long-options \
+ lstat \
+ malloc \
+ mbswidth \
+ memcasecmp \
+ memchr \
+ memcmp \
+ memcpy \
+ memmove \
+ mempcpy \
+ memrchr \
+ memset \
+ mgetgroups \
+ mkancesdirs \
+ mkdir \
+ mkdir-p \
+ mkstemp \
+ mktime \
+ modechange \
+ mountlist \
+ mpsort \
+ obstack \
+ pathmax \
+ perl \
+ physmem \
+ posix-shell \
+ posixtm \
+ posixver \
+ putenv \
+ quote \
+ quotearg \
+ raise \
+ randint \
+ randperm \
+ readlink \
+ readtokens \
+ readtokens0 \
+ readutmp \
+ realloc \
+ regex \
+ rename \
+ rename-dest-slash \
+ rmdir \
+ rmdir-errno \
+ root-dev-ino \
+ rpmatch \
+ safe-read \
+ same \
+ save-cwd \
+ savedir \
+ savewd \
+ selinux-at \
+ settime \
+ sig2str \
+ ssize_t \
+ stat-macros \
+ stat-time \
+ stdbool \
+ stdlib-safer \
+ stpcpy \
+ stpncpy \
+ strcspn \
+ strftime \
+ strpbrk \
+ strtod \
+ strtoimax \
+ strtol \
+ strtoumax \
+ strverscmp \
+ sys_stat \
+ timespec \
+ tzset \
+ unicodeio \
+ unistd-safer \
+ unlink-busy \
+ unlinkdir \
+ unlocked-io \
+ uptime \
+ userspec \
+ utime \
+ utimecmp \
+ utimens \
+ vasprintf-posix \
+ verify \
+ version-etc-fsf \
+ wcwidth \
+ winsz-ioctl \
+ winsz-termios \
+ write-any-file \
+ xalloc \
+ xgetcwd \
+ xgethostname \
+ xmemcoll \
+ xnanosleep \
+ xprintf \
+ xprintf-posix \
+ xstrtod \
+ xstrtoimax \
+ xstrtol \
+ xstrtold \
+ xstrtoumax \
+ yesno
diff --git a/steps/coreutils-6.10/pass1.sh b/steps/coreutils-6.10/pass1.sh
index a5930c19..2fc5b31c 100755
--- a/steps/coreutils-6.10/pass1.sh
+++ b/steps/coreutils-6.10/pass1.sh
@@ -4,13 +4,12 @@
 
 src_prepare() {
     default
-    mv lib/fnmatch.in.h lib/fnmatch.h
 
-    # gperf pregenerated files
-    rm lib/iconv_open-hpux.h lib/iconv_open-aix.h lib/iconv_open-irix.h lib/iconv_open-osf.h
+    . ../../import-gnulib.sh
+
+    mv lib/fnmatch.in.h lib/fnmatch.h
 
     # Rebuild bison pre-generated file
-    rm lib/getdate.c
     cd lib
     bison --update getdate.y
     bison getdate.y
@@ -20,4 +19,3 @@ src_prepare() {
     touch config.h
     touch lib/configmake.h
 }
-
diff --git a/steps/coreutils-6.10/sources b/steps/coreutils-6.10/sources
index 5fe69f17..465980c8 100644
--- a/steps/coreutils-6.10/sources
+++ b/steps/coreutils-6.10/sources
@@ -1 +1,2 @@
-https://mirrors.kernel.org/gnu/coreutils/coreutils-6.10.tar.lzma 8b05bba1b2726a164e444c314e3f359604b58216be704bed8f2e028449cc6204
+git://git.savannah.gnu.org/coreutils.git~v6.10 http://git.savannah.gnu.org/cgit/coreutils.git/snapshot/coreutils-6.10.tar.xz 722b67c7c4a37e3a5d98f88350e967cdeaf50bb96d5edc1d9664cde942d8c70c
+git://git.savannah.gnu.org/gnulib.git~1533e65 _ 928634c13d4d866fc77f76a71c0b8b66b58defe2eabec10f37cb34f77418b051 gnulib-1533e65.tar.gz