diff --git a/net-misc/purritobin/Manifest b/net-misc/purritobin/Manifest
index 2c34c541cc..c72479b94f 100644
--- a/net-misc/purritobin/Manifest
+++ b/net-misc/purritobin/Manifest
@@ -1 +1,2 @@
 DIST purritobin-0.1.3.tar.gz 7561 BLAKE2B 0b476678e5f06b64741e3cff68822dc7c7f32af0c1313405ae8aa0b39af7e649f33b2405d63194e7634d2f2e75d1715524383f6c1b11170eac925fd814579674 SHA512 8b79fed4abd8412d04af7cf67792a8f6f658f4bc0c87b891275eb7ffb72c747c5174ed8556f6a57f160c6e6e4700bcc55b89ca1076d51d6d59b1fd906e2824a1
+DIST purritobin-0.2.1.tar.gz 9487 BLAKE2B 1aa4e44b5d79d4da6c05195ed5aa187e8c4c2864905b0f225d4e6a0c65b469c046b2172d8b2108588955930dbfc2ab01f6d01b191fd988ebdb7b5714cda2bbd9 SHA512 4dbcc473b2f4df399a572a9ae588c32564eb0d807411448a4da701d2982bc72d45dd2fb5256b9cf1b6d6b3c06b588a18ac7a2f980758763f699fe54d11207ddb
diff --git a/net-misc/purritobin/purritobin-0.2.1.ebuild b/net-misc/purritobin/purritobin-0.2.1.ebuild
new file mode 100644
index 0000000000..2c9702ad7c
--- /dev/null
+++ b/net-misc/purritobin/purritobin-0.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="minimalistic commandline pastebin"
+HOMEPAGE="https://bsd.ac"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PurritoBin/PurritoBin.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/PurritoBin/PurritoBin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/PurritoBin-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="libuv static-libs"
+
+DEPEND="dev-cpp/usockets[libuv=,static-libs?]
+	libuv? ( >=dev-libs/libuv-1.35.0[static-libs?] )
+"
+BDEPEND="
+	dev-cpp/uwebsockets
+"
+
+src_prepare() {
+	sed -i -e "s:.ifdef:ifdef:g" \
+		   -e "s:.else:else:g" \
+		   -e "s:.endif:endif:g" \
+		   Makefile
+	default
+}
+
+src_compile() {
+	env LDFLAGS="-L/usr/$(get_libdir)" \
+		emake $(usex libuv USE_DLIBUV=1 '') \
+		$(usex static-libs USE_STATIC=1 '') \
+		all
+}
+
+src_install() {
+	emake prefix="/usr" \
+		  DESTDIR="${D}" \
+		  install
+	einstalldocs
+}
diff --git a/net-misc/purritobin/purritobin-9999.ebuild b/net-misc/purritobin/purritobin-9999.ebuild
index 210bf602c5..2c9702ad7c 100644
--- a/net-misc/purritobin/purritobin-9999.ebuild
+++ b/net-misc/purritobin/purritobin-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DESCRIPTION="minimalistic commanline pastebin"
+DESCRIPTION="minimalistic commandline pastebin"
 HOMEPAGE="https://bsd.ac"
 
 if [[ ${PV} == 9999 ]]; then
@@ -16,25 +16,35 @@ else
 	S="${WORKDIR}/PurritoBin-${PV}"
 fi
 
-LICENSE="ISC"
+LICENSE="GPL-2"
 SLOT="0"
-IUSE="libuv"
+IUSE="libuv static-libs"
 
-DEPEND=">=dev-cpp/usockets-0.3.5:=[libuv?]
-	>=dev-cpp/uwebsockets-0.17.4
-	libuv? ( >=dev-libs/libuv-1.35.0 )
+DEPEND="dev-cpp/usockets[libuv=,static-libs?]
+	libuv? ( >=dev-libs/libuv-1.35.0[static-libs?] )
 "
-RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-cpp/uwebsockets
+"
+
+src_prepare() {
+	sed -i -e "s:.ifdef:ifdef:g" \
+		   -e "s:.else:else:g" \
+		   -e "s:.endif:endif:g" \
+		   Makefile
+	default
+}
 
 src_compile() {
-	if use libuv; then
-		WITH_LIBUV=1 emake all
-	else
-		emake all
-	fi
+	env LDFLAGS="-L/usr/$(get_libdir)" \
+		emake $(usex libuv USE_DLIBUV=1 '') \
+		$(usex static-libs USE_STATIC=1 '') \
+		all
 }
 
 src_install() {
-	emake prefix="/usr" DESTDIR="${D}" install
+	emake prefix="/usr" \
+		  DESTDIR="${D}" \
+		  install
 	einstalldocs
 }