diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index 5786e22498881..84bf9d460ca78 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1 +1,2 @@
 DIST gnome-tetravex-3.34.4.tar.xz 914456 BLAKE2B 93fb2711c750feff80af8fb671e69aacb10241009855f268b90e333870f71a82a73344486fdb5612aec69b7c1f5d0a628fc31094fd3aee97bb6c5f68cbc825ac SHA512 4affa8823482d901cd2accc9cab43ebf7054f9550778e3b460ea4915e4eef5937ff74430399610101f1e8c06d8e6aa111e9ae240a19043c0907d0a1d013f5f67
+DIST gnome-tetravex-3.36.4.tar.xz 1005996 BLAKE2B 9647f3db8e60c6cccc243d3da798265fc51eb16a463ef37b8259689b6cc36b81391616f36b665f28c108bb0d70bc42ebe2fc1feafbbc77cb3256f78d1bc4c016 SHA512 a3c163ae61b312b94ed32c02eb13ccaf9aa2f5eefede1a0735b4240e3127be0bd6e827fda47b1bc2987f793fc5927ee63cc836bf1e2a149f958acb1946dba954
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild
new file mode 100644
index 0000000000000..31c4ce7053ee7
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Complete the puzzle by matching numbered tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cli +gui"
+REQUIRED_USE="|| ( cli gui )"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.0:2
+	gui? ( >=x11-libs/gtk+-3.22.23:3 )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	gui? ( dev-util/itstool )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use cli build_cli)
+		$(meson_use gui build_gui)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/gnome-tetravex/metadata.xml b/games-puzzle/gnome-tetravex/metadata.xml
index 39980802b1da1..329f3cf780127 100644
--- a/games-puzzle/gnome-tetravex/metadata.xml
+++ b/games-puzzle/gnome-tetravex/metadata.xml
@@ -5,4 +5,8 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<use>
+	<flag name="cli">Build the gnome-tetravex-cli command-line interface</flag>
+	<flag name="gui">Build the gnome-tetravex graphical Gtk user interface</flag>
+</use>
 </pkgmetadata>