diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 9332636..fcefde6 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1 +1 @@
-DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897c4af0c442a6206a446dc25f3c2aae9670c9344fba09606f73b87c73a96150f77bd974c96abe475d204ba5c28068 SHA512 81eb5cf27814234af65409fe93798ec50d9f733978dc606bd33e63d98eb99afb3f988df47dc66a9368a11baee0a35fa1d0d6677af8c23428919e34bd11a25697
+DIST mtd-utils-2.1.3.tar.gz 383897 BLAKE2B 75aa73440101bb4bfc753b7e0b8371c141ea6b648aa3928c5c121f4976e01c37770d09da3683376891a9899d46c6ccbb7685b32c70f925e63916c552ae720037 SHA512 68efffda2077e14560b9c0b0e40ce8567aee21096c2a3e19bfb6febc3bc11d56c4ac5682728f08b6d215754e7cb39f956a3ced1f6bde3142f0d6ea8492b9bfda
diff --git a/sys-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml
index 9075500..f1a55df 100644
--- a/sys-fs/mtd-utils/metadata.xml
+++ b/sys-fs/mtd-utils/metadata.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:mtd-utils_project:mtd-utils</remote-id>
-</upstream>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:mtd-utils_project:mtd-utils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.2-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.2-r1.ebuild
deleted file mode 100644
index 63d3be1..0000000
--- a/sys-fs/mtd-utils/mtd-utils-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils vcs-snapshot
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
-
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	if [[ ${PV} == *.*.* ]] ; then
-		MY_PV="${PV}-*"
-		SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
-	else
-		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
-		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
-	fi
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="xattr"
-
-# We need libuuid
-RDEPEND="!sys-fs/mtd
-	dev-libs/lzo
-	sys-libs/zlib
-	>=sys-apps/util-linux-2.16"
-# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
-# And ACL brings in Attr as well.
-DEPEND="${RDEPEND}
-	xattr? ( sys-apps/acl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580206
-}
-
-makeopts() {
-	# These affect build output, so keep it common between compile & install.
-	echo CROSS=${CHOST}- V=1
-	use xattr || echo WITHOUT_XATTR=1
-}
-
-src_compile() {
-	tc-export AR CC RANLIB
-	local compileopts=(
-		AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
-	)
-	emake $(makeopts) "${compileopts[@]}"
-}
-
-src_install() {
-	emake $(makeopts) install DESTDIR="${ED}"
-	dodoc *.txt
-	newdoc mkfs.ubifs/README README.mkfs.ubifs
-	# TODO: check ubi-utils for docs+scripts
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
new file mode 100644
index 0000000..17c3599
--- /dev/null
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
+HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
+SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="+lzo xattr +zstd"
+
+DEPEND="
+	sys-apps/util-linux
+	sys-libs/zlib
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/acl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/libtool"
+
+DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with lzo) \
+		$(use_with xattr) \
+		$(use_with zstd)
+}
+
+src_install() {
+	default
+	doman \
+		jffsX-utils/mkfs.jffs2.1 \
+		ubi-utils/ubinize.8
+}