diff --git a/pkgs/servers/stayrtr/default.nix b/pkgs/by-name/st/stayrtr/package.nix
similarity index 53%
rename from pkgs/servers/stayrtr/default.nix
rename to pkgs/by-name/st/stayrtr/package.nix
index a372f8ff7bb2..d2cc50cb1e6e 100644
--- a/pkgs/servers/stayrtr/default.nix
+++ b/pkgs/by-name/st/stayrtr/package.nix
@@ -1,25 +1,22 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, stayrtr
-, testers
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  stayrtr,
+  testers,
 }:
 
 buildGoModule rec {
   pname = "stayrtr";
-  version = "0.5.1";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "bgp";
     repo = "stayrtr";
     rev = "v${version}";
-    hash = "sha256-/KwL/SEnHquFhPcYXpvQs71W4K1BrbqTPakatTNF47Q=";
+    hash = "sha256-uNZe3g8hs9c0uXrkWSTA+e/gziOpWqx5oFIJ2ZPgEzU=";
   };
-  vendorHash = "sha256-ndMME9m3kbv/c1iKlU2Pn/YoiRQy7jfVQri3M+qhujk=";
-
-  patches = [
-    ./go.mod.patch
-  ];
+  vendorHash = "sha256-0PtQzwBhUoASUMnAAVZ4EIDmqIEaH0nct2ngyIkR+Qg=";
 
   ldflags = [
     "-s"
@@ -32,9 +29,11 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    description = "Simple RPKI-To-Router server. (Hard fork of GoRTR)";
+    changelog = "https://github.com/bgp/stayrtr/releases/tag/v${version}";
+    description = "RPKI-To-Router server implementation in Go";
     homepage = "https://github.com/bgp/stayrtr/";
     license = licenses.bsd3;
+    mainProgram = "stayrtr";
     maintainers = with maintainers; [ _0x4A6F ];
   };
 }
diff --git a/pkgs/servers/stayrtr/go.mod.patch b/pkgs/servers/stayrtr/go.mod.patch
deleted file mode 100644
index 54c80cbb6b53..000000000000
--- a/pkgs/servers/stayrtr/go.mod.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 0116218..3e31f0e 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,6 +1,6 @@
- module github.com/bgp/stayrtr
- 
--go 1.16
-+go 1.17
- 
- require (
- 	github.com/google/go-cmp v0.5.6
-@@ -10,3 +10,17 @@ require (
- 	golang.org/x/crypto v0.6.0
- 	golang.org/x/sys v0.5.0
- )
-+
-+require (
-+	github.com/beorn7/perks v1.0.1 // indirect
-+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-+	github.com/davecgh/go-spew v1.1.1 // indirect
-+	github.com/golang/protobuf v1.4.3 // indirect
-+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-+	github.com/pmezard/go-difflib v1.0.0 // indirect
-+	github.com/prometheus/client_model v0.2.0 // indirect
-+	github.com/prometheus/common v0.26.0 // indirect
-+	github.com/prometheus/procfs v0.6.0 // indirect
-+	google.golang.org/protobuf v1.26.0-rc.1 // indirect
-+	gopkg.in/yaml.v2 v2.3.0 // indirect
-+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 320702770745..ac038d926675 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38205,8 +38205,6 @@ with pkgs;
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  stayrtr = callPackage ../servers/stayrtr { };
-
   sunshine = callPackage ../servers/sunshine { };
 
   sentencepiece = callPackage ../development/libraries/sentencepiece { };