diff --git a/dev-scheme/chibi/Manifest b/dev-scheme/chibi/Manifest
new file mode 100644
index 0000000000..02dc27673a
--- /dev/null
+++ b/dev-scheme/chibi/Manifest
@@ -0,0 +1 @@
+DIST chibi-0.10.tar.gz 1148573 BLAKE2B 1435d5734bfc44b6d6ddafdb339eea659345eea0db0e9b227830d7a6b6b14d3655af10906e43b6f8abd7eb2b90596fcb5dcc024abd2cba123a184f66ffcd0961 SHA512 348c20468e3b3b084ed25d38860f1afdecfb06ad9ff9ceb178c36930c14aa66a78f48b881a8eda28a30498662e7c722938212ea77b1cea89834d1a4377f0f648
diff --git a/dev-scheme/chibi/chibi-0.10.ebuild b/dev-scheme/chibi/chibi-0.10.ebuild
new file mode 100644
index 0000000000..2554a40ab9
--- /dev/null
+++ b/dev-scheme/chibi/chibi-0.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Minimal Scheme implementation for use as an extension language"
+HOMEPAGE="http://synthcode.com/scheme/chibi/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ashinn/${PN}-scheme.git"
+else
+	SRC_URI="https://github.com/ashinn/${PN}-scheme/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-scheme-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+src_configure() {
+	tc-export CC
+
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export DESTDIR="${D}"
+
+	# if ldconfig (stored in LDCONFIG variable) exists it is ran
+	export LDCONFIG="0"
+}
+
+src_install() {
+	einstalldocs
+
+	emake install
+
+	dosym chibi-scheme /usr/bin/chibi
+}
diff --git a/dev-scheme/chibi/chibi-9999.ebuild b/dev-scheme/chibi/chibi-9999.ebuild
new file mode 100644
index 0000000000..2554a40ab9
--- /dev/null
+++ b/dev-scheme/chibi/chibi-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Minimal Scheme implementation for use as an extension language"
+HOMEPAGE="http://synthcode.com/scheme/chibi/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ashinn/${PN}-scheme.git"
+else
+	SRC_URI="https://github.com/ashinn/${PN}-scheme/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-scheme-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+src_configure() {
+	tc-export CC
+
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export DESTDIR="${D}"
+
+	# if ldconfig (stored in LDCONFIG variable) exists it is ran
+	export LDCONFIG="0"
+}
+
+src_install() {
+	einstalldocs
+
+	emake install
+
+	dosym chibi-scheme /usr/bin/chibi
+}
diff --git a/dev-scheme/chibi/metadata.xml b/dev-scheme/chibi/metadata.xml
new file mode 100644
index 0000000000..f0361bf980
--- /dev/null
+++ b/dev-scheme/chibi/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@riseup.net</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <longdescription lang="en">
+        Chibi-Scheme is a very small library intended for use as an extension
+        and scripting language in C programs. In addition to support for
+        lightweight VM-based threads, each VM itself runs in an isolated heap
+        allowing multiple VMs to run simultaneously in different OS threads.
+        Despite the small size, Chibi-Scheme attempts to do The Right Thing.
+        The default settings include:
+        - a full numeric tower, with rational and complex numbers
+        - full and seamless Unicode support
+        - low-level and high-level hygienic macros
+        - an extensible module system
+        Specifically, the default repl language contains all bindings from R7RS
+        small, available explicitly as the (scheme small) library. The language
+        is built in layers, however - see the manual for instructions on
+        compiling with fewer features or requesting a smaller language
+        on startup.
+    </longdescription>
+    <upstream>
+        <remote-id type="github">ashinn/chibi-scheme</remote-id>
+    </upstream>
+</pkgmetadata>