diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/by-name/bi/birdwatcher/package.nix
similarity index 70%
rename from pkgs/servers/birdwatcher/default.nix
rename to pkgs/by-name/bi/birdwatcher/package.nix
index cca210e4a1bc..9e2d04f2f7e1 100644
--- a/pkgs/servers/birdwatcher/default.nix
+++ b/pkgs/by-name/bi/birdwatcher/package.nix
@@ -1,7 +1,9 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, nixosTests
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  nixosTests,
+  gitUpdater,
 }:
 
 buildGoModule rec {
@@ -19,16 +21,20 @@ buildGoModule rec {
 
   deleteVendor = true;
 
-  passthru.tests = {
-    inherit (nixosTests) birdwatcher;
+  passthru = {
+    tests = {
+      inherit (nixosTests) birdwatcher;
+    };
+
+    updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/alice-lg/birdwatcher";
     description = "Small HTTP server meant to provide an API defined by Barry O'Donovan's birds-eye to the BIRD internet routing daemon";
     changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ stv0g ];
     mainProgram = "birdwatcher";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 333ed232c829..76cc58b5a73f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23923,8 +23923,6 @@ with pkgs;
 
   bird-lg = callPackage ../servers/bird-lg { };
 
-  birdwatcher = callPackage ../servers/birdwatcher { };
-
   bloat = callPackage ../servers/bloat { };
 
   bosun = callPackage ../servers/monitoring/bosun { };