diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/files/iucode_tool-2.3.1-limits-include.patch b/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/files/iucode_tool-2.3.1-limits-include.patch
new file mode 100644
index 0000000000..965bf740e3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/files/iucode_tool-2.3.1-limits-include.patch
@@ -0,0 +1,10 @@
+Fixes build on musl.
+--- a/iucode_tool.c
++++ b/iucode_tool.c
+@@ -29,6 +29,7 @@
+ #include <assert.h>
+ #include <argp.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <time.h>
+ #include <cpuid.h>
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
index cdaff636c1..b6c3cb2099 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,6 +10,12 @@ SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE=""
+
+RDEPEND="elibc_musl? ( sys-libs/argp-standalone )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN/_/-}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-limits-include.patch
+)
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/metadata.xml
index 73dda144f9..b7ae2e3c25 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/iucode_tool/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">iucode-tool/iucode-tool</remote-id>
+		<remote-id type="gitlab">iucode-tool/releases</remote-id>
+	</upstream>
 </pkgmetadata>