diff --git a/machines/renge/configuration.nix b/machines/renge/configuration.nix
index 9f4c4fa..d416956 100644
--- a/machines/renge/configuration.nix
+++ b/machines/renge/configuration.nix
@@ -17,6 +17,7 @@
     ./services/grafana.nix
     ./services/hedgedoc.nix
     ./services/invidious
+    ./services/mastodon.nix
     ./services/matrix
     ./services/murmur.nix
     ./services/password-hash-self-service.nix
diff --git a/machines/renge/secrets.yaml b/machines/renge/secrets.yaml
index 9e44b59..f2ee6ac 100644
--- a/machines/renge/secrets.yaml
+++ b/machines/renge/secrets.yaml
@@ -2,6 +2,7 @@ forgejo-mail: ENC[AES256_GCM,data:3AlFHzVBA5TE4qv5ubG39K0varV8/HabO0q/RJZSD5o=,i
 go-neb-overrides: ENC[AES256_GCM,data:1xy+SdsSTuerRox4skitg1mKLr1MoANFoCzz76TKSA31ORo/oUWVGrYxfusZxrFQWjYGRFpSYzmkzPn1RoWmbXyfwPEcisvjenXLNvwcyoontBd7TiiLdukEtya6RfGLRGKc8tfCzbDUWgiYz5IDMFBvKGnewFjB+au0/Ge2+2DTw6M4negjCz343TO/vbyTr5xT/5smmKz7Ouk9SbEo7yEuHkQPQfedGw2PYT82zdXd/Eje3Zq2EB4xcUU7beGrF1zkOdXQ4OVqB8XnkCnuLtNlnJtsffm0rbPDPD3/nhHKpJ8jXrN54V14dSnHW7yOifGMIus0VFMRZcIT7A+BroM9qzJhW3F4gsF1Bwp0CF+6zLLRjgpA0EOyvOwpLIftBZfMIpveAH62MVY0IBfwDdkI1itEOjj9EhTrOGxBx45Cj6Qk3Mk6ncyr15+E+KAmQRxZJrEW8Grk4PyzuxtxYd0n8LSaRUe1eNVUhHkQNpo/zvAPgrzcRnM91EwIoMvlNmwyC63j1h+OBKlXQgChAaB1O6HFXQY=,iv:pnw0jIcMqA771woDYNHxWMWE6wHGaNsXi5aBXOFAHJU=,tag:Wbcqb0FsctZWOS6u5s82mQ==,type:str]
 hcloud_exporter-environment: ENC[AES256_GCM,data:5gDTeg4C08BgNxBFtzZ7ma6JiafwF4ly5URAG4WxUTlRaUmF32fmbPdAZmveKiKBA8cc6ewcEIfIVJ7d5tbbqCEX+vbf9nr1fuhN05Z6lfsJNLoATclX,iv:GzEnudGDc6+6BJgDtaNnOnT7IK8Z0fsYfs/oJzKO2UA=,tag:LYCvRxNeKdMmNve0aWswrw==,type:str]
 invidious-extra-settings: ENC[AES256_GCM,data:bThgfyu5ESIyTLD7Q09Qici9ZZw/QYfCyBSjtbNb1EglCy0KHZrvDDAN4uDpdKrHxv8ctoN5Db7tRf5LUl6iyW7A5z9uYg481EXq3Sx6tZztepX0vg==,iv:FZ33tQWRsNEPjwuy/mH/N4e4PyjLx7sbv2G+9S5uigY=,tag:0GQn3AgoM2BPC5iCt5py8w==,type:str]
+mastodon-mail: ENC[AES256_GCM,data:RT/fS7cqbcePd2qe7CR5jRh2jtKaS81ICbMUOlPUQsY=,iv:C7GYMB0U2KIfXuEnYaoIEfV89/EnJS6V9iG97X8zkPk=,tag:L4SVe6aYGcarvX1hmMqQOw==,type:str]
 murmur-superuser: ENC[AES256_GCM,data:hPuMK8wbqD/3qKXQbOActq/VJZ+6jFlddQ==,iv:68ZhkpkfxakCOYxFXkCSP/sBamETeSs4CGTRaoBS6co=,tag:5UuYCxDiJ6e2CXjDV5/5yA==,type:str]
 netbox-secret-key: ENC[AES256_GCM,data:lOE95j6CGkbfJQTLeG41g3BPKNhm0arqxIGAzwvXQyeZLBauAdqufQGKD7D4kPNzdZs=,iv:6HWXEr6Ju4IywP+2jpuTfER/bYI2oUgMSZEJCkq4XX8=,tag:TPD5TTr4Sew8lxPS5WIu5Q==,type:str]
 prometheus-htpasswd: ENC[AES256_GCM,data:tiewfUfpvrmbrgk6AsBdiP4ng4TqG5UYf1mFcWOzuk8oO55rfZu+Naummz5RRYhJZil43nHFvn5LfIWkJv+CyPMZjpj7xRp4vb4/OCCAFjEzHhrzYVBYNkHM+ZLUTewEXuPVtZ6CZ5uviTExLN2V1moG3ExJdIoyUD16qh4=,iv:SkH609VxIVKJLmHUUNzICEjxHSyjLdwXfw0b7iU6png=,tag:BfNGcUZmk9ZXUvhoQZn6iQ==,type:str]
@@ -16,8 +17,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-01-10T18:29:17Z"
-    mac: ENC[AES256_GCM,data:jsYCPL7/AFxg9mRM/mKhwiy4eH6ZGMyCCSBu+jSfIk/T8RSd9zh0AZ/p5rAwfbW20AzetivzRB4bSgcymLIcCr900EQLdPIuaZgxeGcbZ80N/7I0zF4u8K8oa1pKhyr1UUj48XjL55IdvVOsyvfq/I/KSbIbO7+fBHeQ51crCeo=,iv:CNmKwvZ61PdeyOvGP7elm/yvokll//fiKxdWFe2cfPo=,tag:PVQRV0G3VtBsD0tk34DHig==,type:str]
+    lastmodified: "2024-04-26T10:40:21Z"
+    mac: ENC[AES256_GCM,data:rjLzGWhG6YTq8hJWvQeyl2pIGcy/2+UN4Hi1c5Cah8Z+LenYS93MIDVAwcb1c28ZWTKA6SiFyMd5pdMVMVMZP+WccnlwRvPySZhfyGtLXG8gR8yk35pUF+9WvrTvnY6geTPGoQTp/CeujEX9ceZ/s5Wq2vnt8JWdUIhLK7A8hiM=,iv:yhbtxFm1AbolC7t0m3S6hRJQ3paz/c9A3dA02e2l5mg=,tag:CoS0jG38DIdJTrFGcM/Hxw==,type:str]
     pgp:
         - created_at: "2024-01-22T00:20:10Z"
           enc: |-
diff --git a/machines/renge/services/mastodon.nix b/machines/renge/services/mastodon.nix
new file mode 100644
index 0000000..5b75c50
--- /dev/null
+++ b/machines/renge/services/mastodon.nix
@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2024 Simon Bruder <simon@sbruder.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+{ config, lib, ... }:
+
+{
+  sops.secrets.mastodon-mail = {
+    owner = config.services.mastodon.user;
+    sopsFile = ../secrets.yaml;
+  };
+
+  services.mastodon = {
+    enable = true;
+    configureNginx = true;
+    localDomain = "procrastination.space";
+    smtp = {
+      createLocally = false;
+      host = "vueko.sbruder.de";
+      port = 465;
+      user = "mastodon@sbruder.de";
+      passwordFile = config.sops.secrets.mastodon-mail.path;
+      fromAddress = config.services.mastodon.smtp.user;
+      authenticate = true;
+    };
+    streamingProcesses = 5;
+    extraConfig = {
+      SMTP_TLS = "true";
+      RAILS_LOG_LEVEL = "warn";
+    };
+  };
+}
diff --git a/machines/vueko/secrets/mail-users.nix b/machines/vueko/secrets/mail-users.nix
index 68d2cbc..5c4701b 100644
Binary files a/machines/vueko/secrets/mail-users.nix and b/machines/vueko/secrets/mail-users.nix differ
diff --git a/pkgs/contact-page/src/index.html b/pkgs/contact-page/src/index.html
index 4578842..ad650e7 100644
--- a/pkgs/contact-page/src/index.html
+++ b/pkgs/contact-page/src/index.html
@@ -24,6 +24,10 @@ SPDX-License-Identifier: CC-BY-SA-4.0
           <td>Matrix</td>
           <td><a id="matrix" href="#">(requires javascript)</a></td>
         </tr>
+        <tr>
+          <td>Fediverse</td>
+          <td><a rel="me" href="https://procrastination.space/@simon">@simon@procrastination.space</a></td>
+        </tr>
         <tr>
           <td>Codeberg</td>
           <td><a href="https://codeberg.org/sbruder">sbruder</a></td>