diff --git a/app-shells/clownfish/Manifest b/app-shells/clownfish/Manifest
new file mode 100644
index 0000000000..977f57dc4e
--- /dev/null
+++ b/app-shells/clownfish/Manifest
@@ -0,0 +1 @@
+DIST clownfish-0_pre20210117.tar.gz 2016 BLAKE2B ab0adb71a87f3745fa093e8d01b3aafdae7ae9ebf415b31b9063c3cffe84eb197e5697baafb7ba4fb9f7a150ec6436ce86af9ae6489d55c1a59f4be2c77f88b6 SHA512 3f7d728dda022bd8451224fbe2db1ab4d3563faa32f5890bad258e67700413a0c1efa5c75a4ee3b0793bf87fc178ba6d6d583d96462250c531fff46654135ee2
diff --git a/app-shells/clownfish/clownfish-0_pre20210117.ebuild b/app-shells/clownfish/clownfish-0_pre20210117.ebuild
new file mode 100644
index 0000000000..fac08acaa0
--- /dev/null
+++ b/app-shells/clownfish/clownfish-0_pre20210117.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="a0db28d8280d05561b8f48c0465480725feeca4c"
+
+DESCRIPTION="fish shell mocks"
+HOMEPAGE="https://github.com/IlanCosman/clownfish"
+SRC_URI="https://github.com/IlanCosman/clownfish/archive/${COMMIT}.tar.gz -> ${PF}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-shells/fish"
+
+DOCS=( README.md )
+
+src_install() {
+	insinto "/usr/share/fish/vendor_functions.d"
+	doins functions/*
+	einstalldocs
+}
diff --git a/app-shells/clownfish/metadata.xml b/app-shells/clownfish/metadata.xml
new file mode 100644
index 0000000000..948db33d0e
--- /dev/null
+++ b/app-shells/clownfish/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>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">IlanCosman/clownfish</remote-id>
+  </upstream>
+</pkgmetadata>