diff --git a/dev-cpp/curlpp/Manifest b/dev-cpp/curlpp/Manifest
index ccf268fc2..01842a5a3 100644
--- a/dev-cpp/curlpp/Manifest
+++ b/dev-cpp/curlpp/Manifest
@@ -3,13 +3,12 @@ Hash: SHA256
 
 AUX no_static_lib.patch 1714 BLAKE2B b149ef9929bc2d056a6ddc8f604450ddd55ef1d3ce3db9fa10ecbb4e762a9f3b8ab63798dd8db9c9be67d773dfb9d3b8e9b96e9087d8f692d2747c0a73c6a5e4 SHA512 5bae41182457e133390167ab7a76f17ddb68d7aab27340b51cee0c0955777c2a8409994ab28bf76a89e32ed0ee3ed34995cf18ecde03fc92f2444603e2fb27c9
 DIST curlpp-0.8.1.tar.gz 143017 BLAKE2B 7f3911499b42077c9f108b0355005744300383836a1c82dcba80207482b231527482fb17dcd78a7f288903e996afaf49a4478c7cb5c821bf597b26f4450a430b SHA512 a46b47150c0f0f1f0056e08966ce2fefa5e86fc729406e0220fbcf400da5409f05c87b636b13da3c4d4460c1177aedb494b9569bbcd9012326d4d5f59376397e
-EBUILD curlpp-0.8.1-r1.ebuild 790 BLAKE2B de3396bfaa6850825d84a747b4dd82de3ce1e71a3c6f630308687f52809a18943897bf9478029d739feca5b49be3abfbee143573fcba9f159fdc2a76315bb5cd SHA512 b8727267acf5c23d2b817255cf6c74a3e9833a396c78abbbf69c897b65cf0336266cae7e7f9ffff539b3692a5f26249eccea4fbbd70cd8f7d8257a65958c5d35
-EBUILD curlpp-0.8.1.ebuild 608 BLAKE2B bcc803602079fcb80654f621409b31819b1ae82fb395cebaa17647c7a70c045381e45bab6504c59b92d14da2c1fa8a65398492ac9dd479fd89142062ccd63dc8 SHA512 cdb79f2a8298d977212534c40e2eae2e88043364ada53838b337ce22155da053850a28429772db9b6f4113614d7743701ca4d6c9f6001d64ce0d05d8df266a6a
+EBUILD curlpp-0.8.1-r2.ebuild 941 BLAKE2B f944a70d530545fe8ccbb06568cdafd55ade74d957fc4658acf53660769c34f7331adac661caf6953fd63bc2ccb5d711b39c1d70fb91fdc7f304460e532c4db1 SHA512 5d9780a9a1639b93448acdc90a55de52559f1dbc0110c772e8007bbf705682eeed64eac7a092d8dbe916a28e86c50f5ce4c24ce2083b59b70fc371fd642ab610
 MISC metadata.xml 508 BLAKE2B 63706103fe7335d4a25491b6c0654b825e67011a9b8acc5dbeead8afe72521d674eda9f6fb5c692f09acefb645b836c9beaa2a65fd4d29eab542f63f8f072278 SHA512 fa93e958f0159e6afe5f35bf690d511faca1c6c162157a2c3106518974523b6bd8800478ce9c41a357392de3d933981e2d456b229078512e5c4797d784963a11
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXLacvwAKCRDPw5SX8bJu
-B8dmAP9BccgGuBMcRFMPKj4ThU1IIf2Qosxv95Q5Ga6dqNojlQD+NryE3aEFRTbH
-NsdwefLh1pw6vcPl6dxrW/+wzJrr7QQ=
-=DhPN
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXUW+JwAKCRDPw5SX8bJu
+B7o4AP9Xmyk3h9zAjJRDJzi2J8wUs+RxeeHORrTV32FRR/n9yAD/bJCycRPawijO
+K2guXJgSpnQHorUc+BBwIK+Tpm7HvfU=
+=zkSz
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild b/dev-cpp/curlpp/curlpp-0.8.1-r2.ebuild
similarity index 75%
rename from dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild
rename to dev-cpp/curlpp/curlpp-0.8.1-r2.ebuild
index 9ac724327..6984aa2f0 100644
--- a/dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild
+++ b/dev-cpp/curlpp/curlpp-0.8.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jpbarrette/curlpp/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=">=net-misc/curl-7.58.0"
@@ -20,7 +20,9 @@ DEPEND=">=dev-util/cmake-3.9.6
 
 src_prepare() {
 	cmake-utils_src_prepare
-	sed -i 's/@LDFLAGS@ //' extras/curlpp.pc.in
+	sed -i 's/@LDFLAGS@ //' extras/curlpp.pc.in || die
+	sed -i 's,@includedir@,${prefix}/@includedir@,' extras/curlpp.pc.in || die
+	sed -i 's,@libdir@,${prefix}/@libdir@,' extras/curlpp.pc.in || die
 	if ! use static-libs; then
 		eapply "${FILESDIR}/no_static_lib.patch"
 	fi
diff --git a/dev-cpp/curlpp/curlpp-0.8.1.ebuild b/dev-cpp/curlpp/curlpp-0.8.1.ebuild
deleted file mode 100644
index 9cbb0211d..000000000
--- a/dev-cpp/curlpp/curlpp-0.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="C++ bindings of libcurl"
-HOMEPAGE="http://www.curlpp.org/"
-SRC_URI="https://github.com/jpbarrette/curlpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples"
-
-RDEPEND=">=net-misc/curl-7.58.0"
-DEPEND=">=dev-util/cmake-3.9.6
-		${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	dodoc Readme.md doc/AUTHORS doc/TODO
-	if use doc; then
-		dodoc doc/guide.pdf
-	fi
-	if use examples; then
-		dodoc -r examples/
-	fi
-}