diff --git a/dev-cpp/pcg-cpp/files/pcg-cpp.pc b/dev-cpp/pcg-cpp/files/pcg-cpp.pc
new file mode 100644
index 0000000000..b289efc015
--- /dev/null
+++ b/dev-cpp/pcg-cpp/files/pcg-cpp.pc
@@ -0,0 +1,9 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+
+Name: pcg-cpp
+Description: Family of better random number generators
+URL: https://www.pcg-random.org
+Version: 0.98.1
+Cflags: -I${includedir}
diff --git a/dev-cpp/pcg-cpp/metadata.xml b/dev-cpp/pcg-cpp/metadata.xml
index 8f65b2c6ae..48ce5f4921 100644
--- a/dev-cpp/pcg-cpp/metadata.xml
+++ b/dev-cpp/pcg-cpp/metadata.xml
@@ -4,6 +4,7 @@
 	<upstream>
 		<remote-id type="github">mneme/pcg-cpp</remote-id>
 		<bugs-to>https://github.com/imneme/pcg-cpp/issues</bugs-to>
+		<doc>https://www.pcg-random.org/using-pcg-cpp.html</doc>
 	</upstream>
 	<maintainer type="person">
 		<email>cyber+gentoo@sysrq.in</email>
diff --git a/dev-cpp/pcg-cpp/pcg-cpp-0.98.1_p20210406.ebuild b/dev-cpp/pcg-cpp/pcg-cpp-0.98.1_p20210406-r1.ebuild
similarity index 64%
rename from dev-cpp/pcg-cpp/pcg-cpp-0.98.1_p20210406.ebuild
rename to dev-cpp/pcg-cpp/pcg-cpp-0.98.1_p20210406-r1.ebuild
index 1687284f61..c6afd30869 100644
--- a/dev-cpp/pcg-cpp/pcg-cpp-0.98.1_p20210406.ebuild
+++ b/dev-cpp/pcg-cpp/pcg-cpp-0.98.1_p20210406-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 COMMIT="ffd522e7188bef30a00c74dc7eb9de5faff90092"
 DESCRIPTION="Family of better random number generators"
@@ -14,15 +14,10 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-src_prepare() {
-	default
-	sed "s/install: all/install:/" -i Makefile || die
-}
-
-# this code installs only headers
+# header-only library
 src_compile() {
 	tc-export CXX
 	if use test ; then
@@ -37,5 +32,14 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	doheader include/*
+
+	docompress -x /usr/share/doc/${PF}/sample
+	use examples && dodoc -r sample
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}"/pcg-cpp.pc
+	sed -e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-i "${ED}"/usr/$(get_libdir)/pkgconfig/pcg-cpp.pc || die
 }