diff --git a/app-shells/fzf-tab/Manifest b/app-shells/fzf-tab/Manifest
new file mode 100644
index 0000000000..159ffd9e3c
--- /dev/null
+++ b/app-shells/fzf-tab/Manifest
@@ -0,0 +1 @@
+DIST fzf-tab-0_pre20220331.tar.gz 774324 BLAKE2B 59ef88380952dce19e615faf9317a2b71e414bc8320d47da94d62cdfbe9eed9485e002d55bc987f0bf77ace2c6ed3d875b6d7bd1e020db26f15df97b544da676 SHA512 3a350af319f5dbb4405988c7bf7372ca17710199000a6807e5d5dfdc5bf8d97b2e93c7a668f33c6341687aebc9115fff6fe3bd312d473a34db12de51dc5c703f
diff --git a/app-shells/fzf-tab/fzf-tab-0_pre20220331.ebuild b/app-shells/fzf-tab/fzf-tab-0_pre20220331.ebuild
new file mode 100644
index 0000000000..b16dfa3d20
--- /dev/null
+++ b/app-shells/fzf-tab/fzf-tab-0_pre20220331.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+MY_COMMIT="103330fdbeba07416d5f90b391eee680cd20d2d6"
+DESCRIPTION="Replace zsh's default completion selection menu with fzf"
+HOMEPAGE="https://github.com/Aloxaf/fzf-tab"
+SRC_URI="https://github.com/Aloxaf/fzf-tab/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-shells/zsh
+	app-shells/fzf
+"
+BDEPEND="
+	test? (
+		app-shells/zsh
+		dev-vcs/git
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-functions/${PN}.zsh
+to your ~/.zshrc after compinit, but before plugins which will wrap
+widgets, such as zsh-autosuggestions or fast-syntax-highlighting"
+
+MY_ZSH_LIBDIR="/usr/share/zsh/site-functions"
+
+src_configure() {
+	# Test fails if we modify FZF_TAB_HOME in place
+	sed -E "s|^FZF_TAB_HOME=\"[^\"]+\"$|FZF_TAB_HOME=\"${MY_ZSH_LIBDIR}/${PN}\"|" \
+		${PN}.zsh > ${PN}-patched.zsh || die "Modifying FZF_TAB_HOME failed"
+
+	pushd modules || die "Changing directory failed"
+	default_src_configure
+}
+
+src_compile() {
+	pushd modules || die "Changing directory failed"
+	default_src_compile
+}
+
+src_test() {
+	pushd test || die "Changing directory failed"
+	ZTST_verbose=1 zsh -f ./runtests.zsh fzftab.ztst || die "One or more tests failed"
+}
+
+src_install() {
+	insinto ${MY_ZSH_LIBDIR}
+	newins ${PN}{-patched,}.zsh
+
+	insinto ${MY_ZSH_LIBDIR}/${PN}
+	doins -r lib
+
+	insinto ${MY_ZSH_LIBDIR}/${PN}/modules/Src/aloxaf
+	doins modules/Src/aloxaf/fzftab.so
+
+	readme.gentoo_create_doc
+	einstalldocs
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fzf-tab/metadata.xml b/app-shells/fzf-tab/metadata.xml
new file mode 100644
index 0000000000..ece0d47d35
--- /dev/null
+++ b/app-shells/fzf-tab/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Aloxaf/fzf-tab</remote-id>
+	</upstream>
+</pkgmetadata>