diff --git a/app-emulation/x16-emulator/Manifest b/app-emulation/x16-emulator/Manifest
index d6b480e..059717d 100644
--- a/app-emulation/x16-emulator/Manifest
+++ b/app-emulation/x16-emulator/Manifest
@@ -1,4 +1,7 @@
 DIST x16-emulator-38.tar.gz 168876 BLAKE2B 8f9b3a3c111b1b2385290756964289848a4ea9a873ed802e6ed20462e5a93d0b32baf430a4b3536ee398049a4dbc7df148d2b5412db8ca25530f641f00cf994a SHA512 6825a53350c33c5699d1d240f545b13e6a21f2c7ca867b8e30d0b5956dea85fcbb9c1729666d11585ca3c1a34651a213b3c742c74a11a3ef07f1d3be3d0a0ad4
+DIST x16-emulator-39.tar.gz 173848 BLAKE2B 3249caa13a59454f4edec029d674ca7b09c13523411482862bd97d06147cba1d818964029150abb6bc06f4fd31b75504ff76a86a184de65216f803e95b566d22 SHA512 5b45e244ef971a8dcdb18d15b7a985b4801a7362271062c9aeae01ea65740c44a0a69076b715f08291417b1db933134b0df3b38552500d2f5811e47ad2f43ada
+DIST x16-rom-39.tar.gz 599453 BLAKE2B c9379769836937c74b83e82bd35087212904f20e4be8106f60c353896936d2fce7e30ab5a9f3b78d39c5d97cce91f662cdf3d504ebdb4d4d972914ab418672c7 SHA512 b74d24b8147702dac86d42acb103cac6d46b2d26293b23b40d6fbcd8423995788d4cd0ab450930daaaefd9ab6e7fa90e63b44c2c028d80a7b2640f08fed59a72
 EBUILD x16-emulator-38.ebuild 1243 BLAKE2B b4638fb5a15033fcf6aea71257aa04de1ea585e7f52976d50e334ec57828a50f2fce5f2f38534f98554fff88ddee45d055f7159c8a349ab4626a4cbf4ef1186b SHA512 a79c3b4207ee89c149e6281baaef8ee4ab48e6797ebd0d1a8226f8e49228786adc55647117ad8853a17373844115770a5e9e847ae918349eff6de47284396bca
-EBUILD x16-emulator-9999.ebuild 1243 BLAKE2B b4638fb5a15033fcf6aea71257aa04de1ea585e7f52976d50e334ec57828a50f2fce5f2f38534f98554fff88ddee45d055f7159c8a349ab4626a4cbf4ef1186b SHA512 a79c3b4207ee89c149e6281baaef8ee4ab48e6797ebd0d1a8226f8e49228786adc55647117ad8853a17373844115770a5e9e847ae918349eff6de47284396bca
-MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80
+EBUILD x16-emulator-39.ebuild 1411 BLAKE2B 5dad37aa4c2adc7149bd67f410df3858091ac49134029d427a64ed020145e7325548fb65f07a5edbf17e678391c6fea81b7882c82320331f8c596f6e20c374bb SHA512 ee6fed354fca5135769fd7ddc7ffb0db6cf54761690a58bdc37490b3b4f254cf851a621f2f5d58a4af42ab768070dac4b3b499d60b6348112dc75b639bad99ba
+EBUILD x16-emulator-9999.ebuild 1411 BLAKE2B 5dad37aa4c2adc7149bd67f410df3858091ac49134029d427a64ed020145e7325548fb65f07a5edbf17e678391c6fea81b7882c82320331f8c596f6e20c374bb SHA512 ee6fed354fca5135769fd7ddc7ffb0db6cf54761690a58bdc37490b3b4f254cf851a621f2f5d58a4af42ab768070dac4b3b499d60b6348112dc75b639bad99ba
+MISC metadata.xml 301 BLAKE2B 74ce32158a18ae7d00b2fb5ea169734ac6825c4ea1cb66c7abfb86e27fb181892fce2455d9aa3b568b0bce9a647fb612321b1415c769aeb462b5adb1499493ee SHA512 f15c998ea128fd4888bff501b22eb9450d2c756ae24e9af83f9ec103686aa7c659cebf68edd407252a9c6e1af4ff23c484052744e83e7a3ea518151b30595f4c
diff --git a/app-emulation/x16-emulator/metadata.xml b/app-emulation/x16-emulator/metadata.xml
index b27c0d9..536f687 100644
--- a/app-emulation/x16-emulator/metadata.xml
+++ b/app-emulation/x16-emulator/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>
+	<use>
+		<flag name="rom">Build the x16-rom</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/x16-emulator/x16-emulator-39.ebuild b/app-emulation/x16-emulator/x16-emulator-39.ebuild
new file mode 100644
index 0000000..6956aae
--- /dev/null
+++ b/app-emulation/x16-emulator/x16-emulator-39.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/commanderx16/x16-emulator.git"
+	ROM_REPO_URI="https://github.com/commanderx16/x16-rom.git"
+	ROM_P="x16-rom-9999"
+else
+	SRC_URI="
+		https://github.com/commanderx16/x16-emulator/archive/r${PV}.tar.gz  -> ${P}.tar.gz
+		https://github.com/commanderx16/x16-rom/archive/r${PV}.tar.gz -> x16-rom-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	MY_P="${PN}-r${PV}"
+	S="${WORKDIR}/${MY_P}"
+	ROM_P="x16-rom-r${PV}"
+fi
+
+DESCRIPTION="Emulator for the Commander X16 computer"
+HOMEPAGE="https://github.com/commanderx16/x16-emulator"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+rom"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	rom? ( dev-embedded/cc65 )
+	media-libs/libsdl2
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		use rom && git-r3_fetch "${ROM_REPO_URI}" || die
+		use rom && git-r3_checkout "${ROM_REPO_URI}" "${WORKDIR}/${ROM_P}" || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i "s/-Werror //" "${S}/Makefile"
+}
+
+src_compile() {
+	default
+	use rom && emake -C "${WORKDIR}/${ROM_P}" || die
+}
+
+src_install() {
+	dodir /opt/${PN}
+	cp "${S}/x16emu" "${D}/opt/${PN}" || die
+	use rom && cp "${WORKDIR}/${ROM_P}/build/x16/rom.bin" "${D}/opt/${PN}" || die
+	dosym "${EPREFIX}/opt/${PN}/x16emu" "${EPREFIX}/usr/bin/x16emu"
+}
diff --git a/app-emulation/x16-emulator/x16-emulator-9999.ebuild b/app-emulation/x16-emulator/x16-emulator-9999.ebuild
index 01c4182..6956aae 100644
--- a/app-emulation/x16-emulator/x16-emulator-9999.ebuild
+++ b/app-emulation/x16-emulator/x16-emulator-9999.ebuild
@@ -1,46 +1,60 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-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/commanderx16/x16-emulator/archive/r${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/commanderx16/x16-emulator.git"
+	ROM_REPO_URI="https://github.com/commanderx16/x16-rom.git"
+	ROM_P="x16-rom-9999"
+else
+	SRC_URI="
+		https://github.com/commanderx16/x16-emulator/archive/r${PV}.tar.gz  -> ${P}.tar.gz
+		https://github.com/commanderx16/x16-rom/archive/r${PV}.tar.gz -> x16-rom-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	MY_P="${PN}-r${PV}"
+	S="${WORKDIR}/${MY_P}"
+	ROM_P="x16-rom-r${PV}"
 fi
 
 DESCRIPTION="Emulator for the Commander X16 computer"
 HOMEPAGE="https://github.com/commanderx16/x16-emulator"
 LICENSE="BSD-2"
 SLOT="0"
+IUSE="+rom"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="
+	rom? ( dev-embedded/cc65 )
+	media-libs/libsdl2
+"
 
 src_unpack() {
-	if [[ ${PV} != *9999* ]]; then
-		default
-		mv "${WORKDIR}/${PN}-r${PV}" "${S}"
-	else
+	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
+		use rom && git-r3_fetch "${ROM_REPO_URI}" || die
+		use rom && git-r3_checkout "${ROM_REPO_URI}" "${WORKDIR}/${ROM_P}" || die
+	else
+		default
 	fi
 }
 
-src_install() {
-	dobin "${S}/x16emu"
+src_prepare() {
+	default
+	sed -i "s/-Werror //" "${S}/Makefile"
 }
 
-pkg_postinst() {
-	elog "The Commander X16 emulator requires a ROM to run. The location can"
-	elog "be specified using the -rom /path/to/rom.bin option."
-	elog
-	elog "Build instructions are available in the README of the x16-rom"
-	elog "repository. The assembler is available as dev-embedded/cc65 in this"
-	elog "overlay. If anyone can think of a good category and directory to put"
-	elog "the ROM, let me know and I'll package it so this won't be necessary."
-	elog
-	elog "https://github.com/commanderx16/x16-rom/blob/master/README.md#building-the-rom"
+src_compile() {
+	default
+	use rom && emake -C "${WORKDIR}/${ROM_P}" || die
+}
+
+src_install() {
+	dodir /opt/${PN}
+	cp "${S}/x16emu" "${D}/opt/${PN}" || die
+	use rom && cp "${WORKDIR}/${ROM_P}/build/x16/rom.bin" "${D}/opt/${PN}" || die
+	dosym "${EPREFIX}/opt/${PN}/x16emu" "${EPREFIX}/usr/bin/x16emu"
 }