diff --git a/net-im/chatty/Manifest b/net-im/chatty/Manifest
index b332180..f3fdbbe 100644
--- a/net-im/chatty/Manifest
+++ b/net-im/chatty/Manifest
@@ -1,4 +1,3 @@
-DIST chatty-v0.6.7.tar.gz 576407 BLAKE2B a6d6d2db170f689b30fb81c7ed3b6e66145eb559b6baf48cd0c2db7a3c4d70b1a16b7735ca7de552d5fbbd28219377676d0128debece9eb2fdba59fa18c7aa5f SHA512 3029843ad6064001e87f8a8a8af82b23cfc7d5dc2ffd35e3506b178a2dbd88046d88c4a22cd2b65f9a279a5ed2199f5dc5cfcbe657c36b79738d4bc0777de6f1
-DIST chatty-v0.7.0_rc5.tar.gz 567107 BLAKE2B ec594b691f3982ae8bcd4f90c0e8e2de83cc08094acf0b6f808e91a8c284cb57684380ffd0c9d88a4b525b33cb99bc51b62679b288c904f5d8f063dcaba87079 SHA512 72d080d58113a085e9311908ade78d8682c48ba811a1e83c73ca19d7461e90e6da6b4e9cc65a07177ea356d8fac6ef0c580683f6e32c5bb6e8b0310ea92fb888
-DIST libcmatrix-e9854d058068df258e7c0a60979e611ad2dc7a25.tar.gz 156438 BLAKE2B 14c197c7c620353164ba79251f2fb92b221a2b4a0bc8ddb140697ab2aa16bf00a45ce6a161564db2958f8a2333744a7c78e354ff7bd7c6cd60c0842ae5bda827 SHA512 9d04a121d91a04b59df85036ca868fa30a23edf7520ba44cb17c7f46cecd03fa04adf77e12c07c1e321e9d83ecca77dc3cc69d5901ce1e49d3e46369ecded26d
+DIST chatty-v0.7.0.tar.gz 565522 BLAKE2B 79a502e61dd4c3f26ff6ecf27e4b87b10debcb44003e952c80057e286dc9642831f49cde79d3765aaff68b77e2b1cc91830e2becc14a5ffc7695d01a57f04236 SHA512 4b6c0c5f07578cdc2fd78fa00229f6a30810ce856fc5644cc30c96336aea9f9aedbac75a306cfd6cd437b0b7d9bdfa2a8e41f726fb1fe74564492d1096e78b78
+DIST libcmatrix-ec50358d3bf102e7f8f1843e537bcf1f150d2b7a.tar.gz 157114 BLAKE2B fe2c32fb032cdbfe02cc90e1743581e4fdad71c6c5c0cfc87f01aaf40aa5aba6b6c07f48bd59a6bcdfb2e5076213c862ada2acb30097d4e7d055a273af1e854b SHA512 2cca107d97e1e3dac9d3f3d8d404c45b1033c7f672f789fdb27b3b7dbd14c3d5b2a831d952335e45974382589b2d8d6f815272c94174eb51f64ecb84dc29a89d
 DIST libgd-c7c7ff4e05d3fe82854219091cf116cce6b19de0.tar.gz 58318 BLAKE2B f6e02c179340431655965e84f6fb8fac0543b220c2915c111eb7dc32c16d3d595d42c6cf5d303c20e02ebbbc5f01493b830eb99e3e4337a805f6f8b48fd27377 SHA512 681cc23b5a33df88a92e3aac33d0dba1c6ebb69a2bd6f15b6ae31f0b444c108f7bfd1391e604433be58d82c0032028b112652d3d0c473abe4db02d66c55cdef3
diff --git a/net-im/chatty/chatty-0.6.7.ebuild b/net-im/chatty/chatty-0.6.7.ebuild
deleted file mode 100755
index e117693..0000000
--- a/net-im/chatty/chatty-0.6.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson gnome2-utils xdg
-
-COMMIT="37e96593d4accb1c637e992daa8466d444365db5"
-LIBGD_COMMIT="c7c7ff4e05d3fe82854219091cf116cce6b19de0"
-
-DESCRIPTION="XMPP and SMS messaging via libpurple and Modemmanager"
-HOMEPAGE="https://source.puri.sm/Librem5/chatty"
-SRC_URI="
-	https://gitlab.gnome.org/GNOME/libgd/-/archive/${LIBGD_COMMIT}/libgd-${LIBGD_COMMIT}.tar.gz
-	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-3.46.0[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/libgd || die
-	mv "${WORKDIR}"/libgd-"${LIBGD_COMMIT}" "${S}"/subprojects/libgd || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-im/chatty/chatty-0.7.0_rc5.ebuild b/net-im/chatty/chatty-0.7.0.ebuild
similarity index 92%
rename from net-im/chatty/chatty-0.7.0_rc5.ebuild
rename to net-im/chatty/chatty-0.7.0.ebuild
index 54bb02b..9e2da5e 100755
--- a/net-im/chatty/chatty-0.7.0_rc5.ebuild
+++ b/net-im/chatty/chatty-0.7.0.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit meson gnome2-utils xdg
 
-COMMIT="f7f79c46d0bdf38de39939690e1e39614b750fb6"
+COMMIT="80b993469978f2983dcf4f91f35aeea5fa1bd081"
 LIBGD_COMMIT="c7c7ff4e05d3fe82854219091cf116cce6b19de0"
-LIBCM_COMMIT="e9854d058068df258e7c0a60979e611ad2dc7a25"
+LIBCM_COMMIT="ec50358d3bf102e7f8f1843e537bcf1f150d2b7a"
 
 DESCRIPTION="XMPP and SMS messaging via libpurple and Modemmanager"
 HOMEPAGE="https://source.puri.sm/Librem5/chatty"