diff --git a/pkgs/by-name/ma/matrix-zulip-bridge/package.nix b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
new file mode 100644
index 000000000000..89d577665a1a
--- /dev/null
+++ b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "MatrixZulipBridge";
+  version = "0.4.1";
+  pyproject = true;
+
+  disabled = python3Packages.pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "GearKite";
+    repo = "MatrixZulipBridge";
+    rev = "v${version}";
+    hash = "sha256-5bDqZb8xx5SjThZUSmOcctwo6B15cjkIwA26QNfED2A=";
+  };
+
+  build-system = with python3Packages; [
+    poetry-core
+  ];
+
+  dependencies = with python3Packages; [
+    zulip
+    beautifulsoup4
+    bidict
+    coloredlogs
+    emoji
+    markdownify
+    mautrix
+    python-dotenv
+    ruamel-yaml
+    zulip-emoji-mapping
+  ];
+
+  pythonRelaxDeps = [
+    "bidict"
+    "markdownify"
+    "ruamel-yaml"
+    "zulip-emoji-mapping"
+  ];
+
+  pythonImportsCheck = [
+    "matrixzulipbridge"
+  ];
+
+  meta = {
+    description = "Matrix puppeting appservice bridge for Zulip";
+    homepage = "https://github.com/GearKite/MatrixZulipBridge";
+    changelog = "https://github.com/GearKite/MatrixZulipBridge/releases/tag/v${version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ robertrichter ];
+    mainProgram = "matrix-zulip-bridge";
+  };
+}
diff --git a/pkgs/development/python-modules/zulip-emoji-mapping/default.nix b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
new file mode 100644
index 000000000000..74c6919b2e9b
--- /dev/null
+++ b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonPackage rec {
+  pname = "zulip-emoji-mapping";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "GearKite";
+    repo = "zulip-emoji-mapping";
+    rev = "v${version}";
+    hash = "sha256-logm5uAnLAcFqI7mUxKEO9ZmHqRkd6CFiCW4B5tqZzg=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "zulip_emoji_mapping"
+  ];
+
+  meta = {
+    description = "Get emojis by Zulip names";
+    homepage = "https://github.com/GearKite/zulip-emoji-mapping";
+    changelog = "https://github.com/GearKite/zulip-emoji-mapping/releases";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ robertrichter ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e081cf227c56..7d52de38f9ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17864,6 +17864,8 @@ self: super: with self; {
 
   zulip = callPackage ../development/python-modules/zulip { };
 
+  zulip-emoji-mapping = callPackage ../development/python-modules/zulip-emoji-mapping { };
+
   zwave-me-ws = callPackage ../development/python-modules/zwave-me-ws { };
 
   zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { };