diff --git a/media-sound/klystrack/Manifest b/media-sound/klystrack/Manifest
new file mode 100644
index 0000000..070718c
--- /dev/null
+++ b/media-sound/klystrack/Manifest
@@ -0,0 +1,5 @@
+DIST klystrack-1.7.6.tar.gz 575490 BLAKE2B dbcde9745cb4cfa64fe12ff7d5349dbb722e81abc5d73d319da7ade4bf340f020e4cae4f9c945837bc8f3b34ad3289f94ea2d76266ca8e2f9583b46bfc25aca2 SHA512 42bacf7918d7059eb0f0f57070d60fc7d46a7448afcbe733e8dd14a62f14c9185a4a068a1edc711cdfeff8ad1d2cabee253f719d231e0e7745ecf5878716220e
+DIST klystron-for-klystrack-exec.tar.gz 89207 BLAKE2B 5dadc39f2a2d08187b41db166fc362ca5f6bd7a2687d6d4ece5e5baeca0136fc395fc7fdb257a173837c60a746ec6e0d02207032fb743f1edecdb66c416dc230 SHA512 6091e7187c1bdc204b2cfe5b51f7ceccf5c7a95d275d10da8011035310594265a938475589caedbb0546b59eed2851a1fe1b5c1dc5a5aa99e094b75100f7154b
+EBUILD klystrack-1.7.6.ebuild 732 BLAKE2B 78c5cca73c2ba6c45fa66c6d8b99dd3f4538a0f0f4cb1b6566bb7cca5b4d3140c870f9a084a83bc6bf79c28cd7f26793aa98a67c217c4d4a3bc14fe82a7d0674 SHA512 60e9cef380d321245b5224be69bfb2801afbfc3d0ea097113b193583ef4191f1fae842b151458fc2def2b3dee9999a2c63d15d6d568596957c7e7ea9b32c1d99
+EBUILD klystrack-9999.ebuild 386 BLAKE2B 451043fdce1c2b001a62048528a4ab66acf2411a4e514efaee0fe49f0381f83e7abb1afffaa96a1a592f4ce934a56f8b308cfc71bf8ac7bb5e8402e5948c8658 SHA512 5fd5135c4e8c60fd6ee7a0218b0a5d8ff9c884ed787af68a12440171432e2ae17adab97fec9e0519abde5e10ad8f69abf65044b4339b4b1219c716cdbe80f27f
+MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80
diff --git a/media-sound/klystrack/klystrack-1.7.6.ebuild b/media-sound/klystrack/klystrack-1.7.6.ebuild
new file mode 100644
index 0000000..e3c5f4a
--- /dev/null
+++ b/media-sound/klystrack/klystrack-1.7.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+V_KLYSTRON="for-klystrack-exec"
+SRC_URI="
+	https://github.com/kometbomb/klystrack/archive/${PV}-make-fix.tar.gz -> ${P}.tar.gz
+	https://github.com/kometbomb/klystron/archive/${V_KLYSTRON}.tar.gz -> klystron-${V_KLYSTRON}.tar.gz
+"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A really cool fakebit tracker"
+HOMEPAGE="http://kometbomb.github.io/klystrack/"
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${P}-make-fix" "${WORKDIR}/${P}"
+	rm -rf "${S}/klystron" || die
+	cp -r "${WORKDIR}/klystron-${V_KLYSTRON}" "${S}/klystron" || die
+}
diff --git a/media-sound/klystrack/klystrack-9999.ebuild b/media-sound/klystrack/klystrack-9999.ebuild
new file mode 100644
index 0000000..fb8f429
--- /dev/null
+++ b/media-sound/klystrack/klystrack-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/kometbomb/klystrack.git"
+
+inherit git-r3
+
+DESCRIPTION="A really cool fakebit tracker"
+HOMEPAGE="http://kometbomb.github.io/klystrack/"
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/media-sound/klystrack/metadata.xml b/media-sound/klystrack/metadata.xml
new file mode 100644
index 0000000..b27c0d9
--- /dev/null
+++ b/media-sound/klystrack/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>