diff --git a/net-misc/rpki-client/Manifest b/net-misc/rpki-client/Manifest
index 90a4792..2a96c11 100644
--- a/net-misc/rpki-client/Manifest
+++ b/net-misc/rpki-client/Manifest
@@ -1,3 +1,4 @@
 AUX rpki-client-0.2.0-Makefile.patch 596 BLAKE2B 0d8062597885df95ee543536c2a1093fe0b89d86c72d99174cbc7421ac9593b7e2625dca8dd120aee34e54e4e367537ed85d6779065b55832c7a66f3c1cfcc96 SHA512 67214f1522eea7b597287881ab8b110e4e774b0cc83f68fc388a86e7bc394b778a3b5814e302adc5f74862f8fc60953ccf3b7a6e14dbc0e5f7e402cff9af86cf
 DIST rpki-client-0.2.0.tar.gz 68985 BLAKE2B 1e70df7a8e7194d37a6120dbeb141a2c1cddcb2348070b9a1a3176180fda3044d0da32b37916165c12dc25d55aec349bd059e76701235933b8a4014c4e73b202 SHA512 16eba850a39e7312c33718b15b4a520da13872e46bb3339039eff947feaabf5ad698d604be062b535b9ff50135dd07a2c06ebf0f04491960634649b11e493e55
-EBUILD rpki-client-0.2.0.ebuild 900 BLAKE2B 0c96fc7dec503ce6583452a121eb7dcb11c921e1778fc576c3da2aba8f88c86e7dec97c3030f4c5a9fbaf4241450a0d64d575fb4dcf6aad8c5d58d2967f62d12 SHA512 f96680f7c2bed206e951b8d717036f9b1ed1655a2633e78a657926351ec504a14306b2b45c2efc1e284af5c685db537a70b157ac437b3bf6bfceef2c4bc1d3d3
+EBUILD rpki-client-0.2.0.ebuild 1061 BLAKE2B 3cbe8841d2ab8a79bd26e743e06e6750ab1823eadeec531efc930453a1b76f3637160d346ea6aa5a2995ab0046c4d4d3b1cac1d0c4c624f5a49cd9b0ebd55cb3 SHA512 2b5a6ac0cb8869955a8f56a95d86f968ae09f6f999d1f707b32962de787ca530321c3c247fb02b2a9115688080362024b533e74f87f09b4084ed4fa121b97e55
+EBUILD rpki-client-9999.ebuild 947 BLAKE2B d7844bb33fec31a4f47b7caf15e9a1ad6598094142ed51b769c7e677a912282b6a1244074904d17bd2b57f6df2b1687022d9b9a675ffdcb02a7d77bd33c5e864 SHA512 67caedbd9daa018e44636c816e6b58e8a3be4e94066895884b466cfd64f69492d64d47728a6c1e7f8a41ed7fd62cd80071edaafcee725f204ca54c1e3d2202d2
diff --git a/net-misc/rpki-client/rpki-client-0.2.0.ebuild b/net-misc/rpki-client/rpki-client-0.2.0.ebuild
index dc3e440..51282a6 100644
--- a/net-misc/rpki-client/rpki-client-0.2.0.ebuild
+++ b/net-misc/rpki-client/rpki-client-0.2.0.ebuild
@@ -5,10 +5,11 @@ EAPI=7
 
 inherit eutils user
 
+VERSION="VERSION_$(echo ${PV} | sed 's/\./_/g')"
+
 DESCRIPTION="RPKI client implementation"
 HOMEPAGE="https://github.com/kristapsdz/rpki-client"
-#SRC_URI="https://github.com/kristapsdz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/kristapsdz/${PN}/archive/VERSION_0_2_0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/kristapsdz/${PN}/archive/${VERSION}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
@@ -26,9 +27,12 @@ src_configure() {
 
 src_unpack() {
 	unpack ${A}
-	mv ${WORKDIR}/${PN}-VERSION_0_2_0 ${S}
-	cd "${S}"
+	mv ${WORKDIR}/${PN}-${VERSION} ${S}
+}
+
+src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-Makefile.patch"
+	eapply_user
 }
 
 pkg_setup() {
@@ -38,4 +42,8 @@ pkg_setup() {
 
 src_install() {
 	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
+	insinto /usr/share/${PN}
+	doins tals/*
+	keepdir /var/cache/${PN}/{rpki.afrinic.net,rpki.apnic.net,repository.lacnic.net,rpki.ripe.net}
+	fowners -R _rpki-client /var/cache/${PN}/
 }
diff --git a/net-misc/rpki-client/rpki-client-9999.ebuild b/net-misc/rpki-client/rpki-client-9999.ebuild
new file mode 100644
index 0000000..1633e06
--- /dev/null
+++ b/net-misc/rpki-client/rpki-client-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils user git-r3
+
+DESCRIPTION="RPKI client implementation"
+HOMEPAGE="https://github.com/kristapsdz/rpki-client"
+EGIT_REPO_URI="https://github.com/kristapsdz/${PN}.git"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	./configure CPPFLAGS="`pkg-config --cflags openssl`" \
+		LDFLAGS="`pkg-config --libs-only-L openssl`" \
+		LDADD="`pkg-config --libs openssl` -lresolv"
+}
+
+src_prepare() {
+	eapply_user
+}
+
+pkg_setup() {
+	enewgroup _rpki-client
+	enewuser _rpki-client
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
+	insinto /etc/rpki/
+	doins tals/*
+	keepdir /var/db/${PN}/
+	keepdir /var/cache/${PN}/
+	fowners -R _rpki-client /etc/rpki/
+	fowners -R _rpki-client /var/db/${PN}/
+	fowners -R _rpki-client /var/cache/${PN}/
+}