diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
new file mode 100644
index 0000000000000..d30638d3ea896
--- /dev/null
+++ b/net-ftp/uftpd/Manifest
@@ -0,0 +1 @@
+DIST uftpd-2.4.tar.xz 173132 BLAKE2B 5bb1d90a2353e34d1a2346fa09c9843e598827875cc2c09beabf3916e34693dca17bc0d1f00773ce823cb79685204a20fa16d7abc8d4c88085dd1bdafc7e5acc SHA512 1ed9ed4429a3e7a08ac902ebac95610e58164f3528a8fc00a745c0545aae4e13d3bcbf597bcae6ba045b24ee9ba3c39ec0617068920bcc4bbc3f5ef246d4c404
diff --git a/net-ftp/uftpd/metadata.xml b/net-ftp/uftpd/metadata.xml
new file mode 100644
index 0000000000000..80ff0c53f0559
--- /dev/null
+++ b/net-ftp/uftpd/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<name>Oz Tiram</name>
+<email>oz.tiram@gmail.com</email>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+ The no nonsense TFTP/FTP server.
+ An excellent choice for those of us who never wanted to learn every
+ config file format on this planet.  uftpd has no configuration, and
+ starts automatically from the traditional UNIX inetd super server,
+ neatly tcpwrapped for your safety.
+
+ Hardcore Internet users and anyone concerned about security should
+ probably consider a seperate TFTP server and for FTP look at one of:
+ vsftpd, proftpd or pure-ftpd.
+</longdescription>
+<upstream>
+ <remote-id type="github">troglobit/uftpd</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-ftp/uftpd/uftpd-2.4.ebuild b/net-ftp/uftpd/uftpd-2.4.ebuild
new file mode 100644
index 0000000000000..ad41f43f2ca51
--- /dev/null
+++ b/net-ftp/uftpd/uftpd-2.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The no nonsense TFTP/FTP server."
+HOMEPAGE="https://github.com/troglobit/uftpd"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libite
+	dev-libs/libuev
+	!!net-misc/uftp"
+
+RDEPEND="${DEPEND}"