diff --git a/srcpkgs/chroot-findutils/template b/srcpkgs/chroot-findutils/template
index c22876f303c..6f34e8fa741 100644
--- a/srcpkgs/chroot-findutils/template
+++ b/srcpkgs/chroot-findutils/template
@@ -1,16 +1,15 @@
 # Template file for 'chroot-findutils'
 pkgname=chroot-findutils
 version=4.4.2
-revision=2
+revision=3
 wrksrc="findutils-${version}"
 bootstrap=yes
 conflicts="findutils>=0"
 provides="findutils-${version}_${revision}"
 build_style=gnu-configure
 configure_args="--disable-nls gl_cv_func_wcwidth_works=yes
- gl_cv_header_working_fcntl_h=yes ac_cv_func_fnmatch_gnu=yes
- gl_cv_func_gettimeofday_clobber=no ac_cv_func_working_mktime=yes
- am_cv_func_working_getline=yes"
+ gl_cv_header_working_fcntl_h=yes am_cv_func_working_getline=yes
+ gl_cv_func_gettimeofday_clobber=no ac_cv_func_working_mktime=yes"
 short_desc="The GNU Find Utilities -- for xbps-src use"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -22,9 +21,9 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		# Special case for musl libc; "fix" issues with gnulib.
-		cp -f ${XBPS_CROSSPFDIR}/musl-gnulibfix .
-		chmod 755 musl-gnulibfix
-		./musl-gnulibfix gnulib/lib
+		: > gnulib/lib/freadahead.c
+		: > gnulib/lib/fseeko.c
+		echo "void close_stdin(void) {}" > gnulib/lib/closein.c
 		;;
 	esac
 }
@@ -34,4 +33,7 @@ post_install() {
 		rm -f ${DESTDIR}/usr/bin/${f}
 	done
 	rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec
+	if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+		rm -f ${DESTDIR}/usr/lib/charset.alias
+	fi
 }