diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix
new file mode 100644
index 00000000000..bad985e818c
--- /dev/null
+++ b/pkgs/servers/mautrix-discord/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, olm
+, nix-update-script
+, testers
+, mautrix-discord
+}:
+
+buildGoModule rec {
+  pname = "mautrix-discord";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "mautrix";
+    repo = "discord";
+    rev = "v${version}";
+    hash = "sha256-rs7wWlQMc79Vls+cqPPo+lRzYAGye4WcKKz+9EXlEBo=";
+  };
+
+  vendorSha256 = "sha256-ZI1+Tfru2OfnqLnaaiDL08OtSmbMBiRDvkL39+jhhmI=";
+
+  ldflags = [ "-s" "-w" ];
+
+  buildInputs = [ olm ];
+
+  doCheck = false;
+
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = mautrix-discord;
+    };
+  };
+
+  meta = with lib; {
+    description = "A Matrix-Discord puppeting bridge";
+    homepage = "https://github.com/mautrix/discord";
+    changelog = "https://github.com/mautrix/discord/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ MoritzBoehme ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60f45252c1f..dbe4792bb55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9993,6 +9993,8 @@ with pkgs;
 
   matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot { };
 
+  mautrix-discord = callPackage ../servers/mautrix-discord { };
+
   mautrix-facebook = callPackage ../servers/mautrix-facebook { };
 
   mautrix-googlechat = callPackage ../servers/mautrix-googlechat { };