diff --git a/net-im/chatty/Manifest b/net-im/chatty/Manifest
index 1affcb2..944aeaf 100644
--- a/net-im/chatty/Manifest
+++ b/net-im/chatty/Manifest
@@ -1 +1,2 @@
 DIST chatty-v0.4.0.tar.gz 482919 BLAKE2B 9df1709c477a2f39f1b31cb06d8a00d5e07cc7657c2d2f997bfd42b9580964aea9908cb015dddd6dce2983e4fc52f7123fb87d8ba2a97f4ca23da620ac1daab3 SHA512 0d05b3b4d4700693f072e055605d467f3b65afb07dea8e613bd1f282f47d6d2ae8ff584dec23ca2cb9048d0aed65fdf949af66c1382a08955e10e8cf0c5ccabc
+DIST chatty-v0.6.0.tar.gz 559891 BLAKE2B d7cdd4096f7340589669222712bd371bec4940cbfe238c930353b5908a0dc0383bb65c285699cf370e8872ce2418b958a1d9f31bb809129cd3fe678f905a64dd SHA512 8e72aa0293b1074d36e982d952ecc026832b73f8d8c1a12d32794752063d477b8fbf8c1779434fe60fc49e585bc0f985f16042cebbc6c0e85807e399457d7d0d
diff --git a/net-im/chatty/chatty-0.4.0.ebuild b/net-im/chatty/chatty-0.4.0.ebuild
index a4cb7da..9391ac4 100644
--- a/net-im/chatty/chatty-0.4.0.ebuild
+++ b/net-im/chatty/chatty-0.4.0.ebuild
@@ -7,7 +7,7 @@ inherit meson gnome2-utils xdg
 
 COMMIT="501805ee4e013470c1c9eb17e930f9fe914e3671"
 
-DESCRIPTION="Messaging client"
+DESCRIPTION="XMPP and SMS messaging via libpurple and Modemmanager"
 HOMEPAGE="https://source.puri.sm/Librem5/chatty"
 SRC_URI="https://source.puri.sm/Librem5/chatty/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 
@@ -15,7 +15,7 @@ SRC_URI="https://source.puri.sm/Librem5/chatty/-/archive/v${PV}/${PN}-v${PV}.tar
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm64 ~arm ~x86"
+KEYWORDS="~arm64"
 
 DEPEND="	gnome-extra/evolution-data-server[phonenumber]
 		dev-libs/feedbackd
diff --git a/net-im/chatty/chatty-0.6.0.ebuild b/net-im/chatty/chatty-0.6.0.ebuild
new file mode 100644
index 0000000..3e84577
--- /dev/null
+++ b/net-im/chatty/chatty-0.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson gnome2-utils xdg
+
+COMMIT="da26b33a98137e542efd840eadae426b0cdb7b42"
+
+DESCRIPTION="XMPP and SMS messaging via libpurple and Modemmanager"
+HOMEPAGE="https://source.puri.sm/Librem5/chatty"
+SRC_URI="https://source.puri.sm/Librem5/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
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+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
index aaf92b5..149bd0b 100644
--- a/net-im/chatty/metadata.xml
+++ b/net-im/chatty/metadata.xml
@@ -5,11 +5,7 @@
 		<email>gjdijkman@gjdwebserver.nl</email>
 		<name>Gerben Jan Dijkman</name>
 	</maintainer>
-	<longdescription lang="en">
-	XMPP and SMS messaging via libpurple and Modemmanager.
-	</longdescription>
 	<upstream>
-		<doc>https://source.puri.sm/Librem5/chatty</doc>
 		<bugs-to>https://source.puri.sm/Librem5/chatty/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>