diff --git a/dev-embedded/cc65/Manifest b/dev-embedded/cc65/Manifest
index bcead19..cd4e201 100644
--- a/dev-embedded/cc65/Manifest
+++ b/dev-embedded/cc65/Manifest
@@ -1,4 +1,4 @@
 DIST cc65-2.19.tar.gz 2284735 BLAKE2B c1c845417e38113c99a9ec8fbff1b90e292798582ac2b394e40419eff3eea62d838ea52165188516efc6157ef02aa7fc23c5a6510fd40d1012ad2b5231d78097 SHA512 e893359249588247d262ff19b8b7efbbcb10a274964aaa18cfe21830cce39da53831262bcc8ee4678158c0e0ab56905411b037699d1097aa5fc03edf7d6bea8f
-EBUILD cc65-2.19.ebuild 525 BLAKE2B 0f4877b39322777093324181d4c7c79fc9aff8dcd955edde34a3373f9d342524eeba59f08f7864a8a05e5d426c09fe6aabd20113b7f924eacbb2a52d04549fb0 SHA512 19cd35f17ba87c512c73ec6d753bd0720d615aada3329df191d723a7f3205bf9fedd5d5f4be51371db9af6c19b6346aef70a63fc44424537fb8d18ef22d167ee
-EBUILD cc65-9999.ebuild 525 BLAKE2B 0f4877b39322777093324181d4c7c79fc9aff8dcd955edde34a3373f9d342524eeba59f08f7864a8a05e5d426c09fe6aabd20113b7f924eacbb2a52d04549fb0 SHA512 19cd35f17ba87c512c73ec6d753bd0720d615aada3329df191d723a7f3205bf9fedd5d5f4be51371db9af6c19b6346aef70a63fc44424537fb8d18ef22d167ee
-MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80
+EBUILD cc65-2.19.ebuild 664 BLAKE2B 35bec25e4095e4ad5a75dcd3002eaef767f4beee6103d3e73c768f053ab972414fcd7bc745dbf47921c800c4e00490d45a9d446bba2f258e3b8617c0d360d559 SHA512 21f4e45ce63a90fb1c9c11330833b29778358cea56ad516fab1598d2d8c018f70b16e3374bbcc9b056627617a69e30b1d81f5974ae1d293348f08f412c9f4956
+EBUILD cc65-9999.ebuild 664 BLAKE2B 35bec25e4095e4ad5a75dcd3002eaef767f4beee6103d3e73c768f053ab972414fcd7bc745dbf47921c800c4e00490d45a9d446bba2f258e3b8617c0d360d559 SHA512 21f4e45ce63a90fb1c9c11330833b29778358cea56ad516fab1598d2d8c018f70b16e3374bbcc9b056627617a69e30b1d81f5974ae1d293348f08f412c9f4956
+MISC metadata.xml 316 BLAKE2B dc3f6c6a6cb16a7b405496bc11cba8bda0946d7a46013cef79bd9c73c2b975fff06e65db6d1f048a835c22c92d48350c1f92f29c380af3fadf9894ba0e53daf2 SHA512 44234cf47884531c4cfc4724c668c0617407924c66762ad67e8428dd6c37101307eeddb5faeb8a41c83f19ab92eab633ccc6647236626edd2a44bb2ee8e9cab2
diff --git a/dev-embedded/cc65/cc65-2.19.ebuild b/dev-embedded/cc65/cc65-2.19.ebuild
index 4c43098..2c24a16 100644
--- a/dev-embedded/cc65/cc65-2.19.ebuild
+++ b/dev-embedded/cc65/cc65-2.19.ebuild
@@ -1,25 +1,31 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/cc65/cc65/archive/V${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cc65/cc65.git"
+else
+	SRC_URI="https://github.com/cc65/cc65/archive/V${PV}.tar.gz  -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="A C compiler for 6502-based systems"
 HOMEPAGE="https://cc65.github.io/"
 LICENSE="ZLIB"
+IUSE="doc"
 SLOT="0"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="doc? ( app-text/linuxdoc-tools )"
+
+src_compile() {
+	emake PREFIX="/usr"
+	use doc && emake -C doc
+}
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="/usr" DESTPACKAGE_SUFFIX="-${PV}" install
 }
diff --git a/dev-embedded/cc65/cc65-9999.ebuild b/dev-embedded/cc65/cc65-9999.ebuild
index 4c43098..2c24a16 100644
--- a/dev-embedded/cc65/cc65-9999.ebuild
+++ b/dev-embedded/cc65/cc65-9999.ebuild
@@ -1,25 +1,31 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/cc65/cc65/archive/V${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cc65/cc65.git"
+else
+	SRC_URI="https://github.com/cc65/cc65/archive/V${PV}.tar.gz  -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="A C compiler for 6502-based systems"
 HOMEPAGE="https://cc65.github.io/"
 LICENSE="ZLIB"
+IUSE="doc"
 SLOT="0"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="doc? ( app-text/linuxdoc-tools )"
+
+src_compile() {
+	emake PREFIX="/usr"
+	use doc && emake -C doc
+}
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="/usr" DESTPACKAGE_SUFFIX="-${PV}" install
 }
diff --git a/dev-embedded/cc65/metadata.xml b/dev-embedded/cc65/metadata.xml
index b27c0d9..2265f2f 100644
--- a/dev-embedded/cc65/metadata.xml
+++ b/dev-embedded/cc65/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>flewkey@2a03.party</email>
-<name>Ryan Fox</name>
-</maintainer>
+	<maintainer type="person">
+		<email>flewkey@2a03.party</email>
+		<name>Ryan Fox</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cc65/cc65</remote-id>
+	</upstream>
 </pkgmetadata>