diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/by-name/ma/matterircd/package.nix
similarity index 91%
rename from pkgs/servers/mattermost/matterircd.nix
rename to pkgs/by-name/ma/matterircd/package.nix
index 3aba439aff8b..11fc0080a9e0 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/by-name/ma/matterircd/package.nix
@@ -20,6 +20,6 @@ buildGoModule rec {
     mainProgram = "matterircd";
     homepage = "https://github.com/42wim/matterircd";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ numinit ];
   };
 }
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/by-name/ma/mattermost/package.nix
similarity index 94%
rename from pkgs/servers/mattermost/default.nix
rename to pkgs/by-name/ma/mattermost/package.nix
index 4c35070ededc..d1d1a278ffdc 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -12,13 +12,13 @@ buildGoModule rec {
   # See https://docs.mattermost.com/upgrade/extended-support-release.html
   # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
   # the version regex in passthru.updateScript as well.
-  version = "9.5.10";
+  version = "9.5.11";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "mattermost";
     rev = "v${version}";
-    hash = "sha256-KUauFuRlOxBNNqE88pv5j0afEYQOZG6kWuyHnzg5qwQ=";
+    hash = "sha256-kPsBQjBMHxh5EGTFPNceE51nSEKSu6ieifIAV8PjpAc=";
   };
 
   # Needed because buildGoModule does not support go workspaces yet.
@@ -34,7 +34,7 @@ buildGoModule rec {
 
   webapp = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-    hash = "sha256-psGNLmiT60HknrwESjztlr8NUPPnHsNmSTaRJ0RRqBE=";
+    hash = "sha256-dRB0CqUoEIkCDlH/vcn/S1TLlhz9iWp61WM2kk+ToZk=";
   };
 
   # Makes nix-update-script pick up the fetchurl for the webapp.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed59bb99bf8f..89501790ab91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24480,9 +24480,6 @@ with pkgs;
 
   matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { };
 
-  mattermost = callPackage ../servers/mattermost { };
-  matterircd = callPackage ../servers/mattermost/matterircd.nix { };
-
   mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
 
   memcached = callPackage ../servers/memcached { };