diff --git a/pkgs/by-name/ch/chatty/package.nix b/pkgs/by-name/ch/chatty/package.nix
index 909e13940a6a..b93bbd84b9f0 100644
--- a/pkgs/by-name/ch/chatty/package.nix
+++ b/pkgs/by-name/ch/chatty/package.nix
@@ -18,12 +18,10 @@
   gtk4,
   gtksourceview5,
   gst_all_1,
-  json-glib,
-  libgcrypt,
+  libcmatrix,
   libadwaita,
   libphonenumber,
   modemmanager,
-  olm,
   pidgin,
   protobuf,
   sqlite,
@@ -32,17 +30,22 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chatty";
-  version = "0.8.4";
+  version = "0.8.6";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Chatty";
-    rev = "v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-1CHreTkw1C3tc6vOCG+7Y/u4R/xTFOnlI4mcxjY/alY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-iPqV3xluzHPm8TCOOLvczoAPe3LuJuhWEBnQWBUU18U=";
   };
 
+  postPatch = ''
+    # https://gitlab.gnome.org/World/Chatty/-/merge_requests/1465
+    substituteInPlace src/matrix/chatty-ma-account.c \
+      --replace-fail '#include <libsecret/secret.h>' ""
+  '';
+
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils
@@ -63,12 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
     gtk4
     gtksourceview5
     gst_all_1.gstreamer
-    json-glib
-    libgcrypt
+    libcmatrix
     libadwaita
     libphonenumber
     modemmanager
-    olm
     pidgin
     protobuf
     sqlite
@@ -85,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "XMPP and SMS messaging via libpurple and ModemManager";
     mainProgram = "chatty";
     homepage = "https://gitlab.gnome.org/World/Chatty";
-    changelog = "https://gitlab.gnome.org/World/Chatty/-/blob/${finalAttrs.src.rev}/NEWS";
+    changelog = "https://gitlab.gnome.org/World/Chatty/-/blob/${finalAttrs.src.tag}/NEWS";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dotlambda ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/li/libcmatrix/package.nix b/pkgs/by-name/li/libcmatrix/package.nix
new file mode 100644
index 000000000000..4994dfe8697d
--- /dev/null
+++ b/pkgs/by-name/li/libcmatrix/package.nix
@@ -0,0 +1,52 @@
+{
+  fetchFromGitLab,
+  glib,
+  json-glib,
+  lib,
+  libgcrypt,
+  libsecret,
+  libsoup_3,
+  meson,
+  ninja,
+  olm,
+  pkg-config,
+  sqlite,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libcmatrix";
+  version = "0.0.3";
+
+  src = fetchFromGitLab {
+    domain = "source.puri.sm";
+    owner = "Librem5";
+    repo = "libcmatrix";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Usaqkb6zClVtYCL1VUv4iNeKs2GZECO9sOdPk3N8iLM=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    json-glib
+    libgcrypt
+    libsecret
+    libsoup_3
+    olm
+    sqlite
+  ];
+
+  meta = {
+    changelog = "https://source.puri.sm/Librem5/libcmatrix/-/blob/${finalAttrs.src.tag}/NEWS";
+    description = "Matrix protocol library written in C using GObject";
+    homepage = "https://source.puri.sm/Librem5/libcmatrix";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+})