diff --git a/net-im/chatty/Manifest b/net-im/chatty/Manifest
new file mode 100644
index 0000000..8bc5226
--- /dev/null
+++ b/net-im/chatty/Manifest
@@ -0,0 +1,2 @@
+DIST chatty-v0.8.3.tar.gz 1671653 BLAKE2B 1c6d1dab2b441b433656b79beabb53c62104ef9f5063cd7ed230cd8fb553b2772f5ecb0b7b902ec0c2787f122b5966a7082ac59961dae87031239b18b61caccc SHA512 b7d3ffee3d0515c80547e657aba8fece91050fa1ee9893167506a890d0de88b31bfd413c9c817f0bbc81e1ceceef1a070ec66eba95ae84b88941a13e781e39c5
+DIST libcmatrix-6c260ee37bd2eff096ee44c29690f30718566c1c.tar.gz 156516 BLAKE2B c40b96f87c29c6c449a46bab580f7c83ba03dfd80d1eff39ae87944d1d14d666e23dc444cd64d7d42bb2041c37606baf4cbc2ff9b14664cabfdc2f3f2e08af07 SHA512 19dda48dcad027a737dae4031c5556bd42c204c45c7a870192b0ce3e61e211484cb52b3a8cce576ee757cda37c1a7cbef6746304b9d80efe103d2df7a2b199c2
diff --git a/net-im/chatty/chatty-0.8.3.ebuild b/net-im/chatty/chatty-0.8.3.ebuild
new file mode 100755
index 0000000..ac72db2
--- /dev/null
+++ b/net-im/chatty/chatty-0.8.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+
+inherit meson gnome2-utils xdg
+LIBCM_COMMIT="6c260ee37bd2eff096ee44c29690f30718566c1c"
+
+DESCRIPTION="XMPP and SMS messaging via libpurple and Modemmanager"
+HOMEPAGE="https://source.puri.sm/Librem5/chatty"
+SRC_URI="
+	https://source.puri.sm/Librem5/libcmatrix/-/archive/${LIBCM_COMMIT}/libcmatrix-${LIBCM_COMMIT}.tar.gz
+	https://gitlab.gnome.org/World/Chatty/-/archive/v${PV}/${PN}-v${PV}.tar.gz
+	"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~arm64"
+
+DEPEND="	gnome-extra/evolution-data-server[phonenumber]
+		dev-libs/feedbackd
+		gui-libs/libhandy
+		x11-plugins/purple-mm-sms
+		dev-libs/olm
+		dev-libs/libphonenumber
+		x11-libs/gtk+:3
+		net-im/jabber-base
+		x11-plugins/lurch
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+	default
+	eapply_user
+	rm -r "${S}"/subprojects/libcmatrix || die
+	mv "${WORKDIR}"/libcmatrix-"${LIBCM_COMMIT}" "${S}"/subprojects/libcmatrix || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-im/chatty/metadata.xml b/net-im/chatty/metadata.xml
new file mode 100755
index 0000000..149bd0b
--- /dev/null
+++ b/net-im/chatty/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>gjdijkman@gjdwebserver.nl</email>
+		<name>Gerben Jan Dijkman</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://source.puri.sm/Librem5/chatty/-/issues</bugs-to>
+	</upstream>
+</pkgmetadata>