diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.3-r1.ebuild
similarity index 97%
rename from sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.3.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.3-r1.ebuild
index 28ef863e8f..e162ab76d1 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.3-r1.ebuild
@@ -341,6 +341,21 @@ multilib_src_configure() {
 		)
 	fi
 
+	if use kernel_Hurd ; then
+		# Disable Linux-specific features
+		myeconfargs+=(
+			--disable-partx
+			--disable-rfkill
+			--disable-schedutils
+			--disable-fsck
+		)
+
+		# This is explicitly needed for some reason? TODO
+		myeconfargs+=(
+			--enable-agetty
+		)
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
 	if multilib_is_native_abi && use python ; then
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild
index be530b836b..702d503926 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild
@@ -316,6 +316,21 @@ multilib_src_configure() {
 		)
 	fi
 
+	if use kernel_Hurd ; then
+		# Disable Linux-specific features
+		emesonargs+=(
+			-Dbuild-partx=disabled
+			-Dbuild-rfkill=disabled
+			-Dbuild-schedutils=disabled
+			-Dbuild-fsck=disabled
+		)
+
+		# This is explicitly needed for some reason? TODO
+		emesonargs+=(
+			-Dbuild-agetty=enabled
+		)
+	fi
+
 	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
 	cat >> ${native_file} <<-EOF || die
 	[binaries]