diff --git a/packages/block_router/default.nix b/packages/block_router/default.nix
new file mode 100644
index 0000000..c758811
--- /dev/null
+++ b/packages/block_router/default.nix
@@ -0,0 +1,38 @@
+# SPDX-License-Identifier: CC0-1.0
+
+{ stdenv, fetchgit, tup, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  pname = "block_router";
+  version = "0.1.0";
+
+  nativeBuildInputs = [ tup pkgconfig ];
+
+  src = fetchgit {
+    url = "https://git.sr.ht/~ehmry/block_router";
+    rev = "v" + version;
+    sha256 = "00i27wqwp5a8dnig79r53kcz2v7a94ih1qshwqzzpqfmp4lj61p2";
+  };
+
+  configurePhase = ''
+    # Scan repository and generate script
+    tup init
+    tup generate buildPhase.sh
+  '';
+
+  buildPhase = ''
+    pushd .
+    set -v
+    source buildPhase.sh
+    set +v
+    popd
+  '';
+
+  installPhase = "install -Dm755 {.,$out}/block_router";
+
+  meta = with stdenv.lib; {
+    license = licenses.agpl3;
+    maintainers = [ maintainers.ehmry ];
+  };
+
+}
diff --git a/packages/default.nix b/packages/default.nix
index b37e8bd..3adca18 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -75,19 +75,7 @@ in rec {
 
   bender = buildPackages.callPackage ./bender { };
 
-  block_router = let
-    src = fetchgit {
-      url = "https://git.sr.ht/~ehmry/block_router";
-      rev = "dd78a4824bbc28c5760fda55e9d5dd23cbee8ecf";
-      sha256 = "1444nfgbgqggmyhjh81aac3mwixh7h6m1qmk8ikinf8gnl9mbngx";
-    };
-  in buildUpstream {
-    name = "block_router";
-    targets = [ "block_router" ];
-    postConfigure = ''
-      echo REPOSITORIES += ${src} >> $BUILD_DIR/etc/build.conf
-    '';
-  };
+  block_router = callPackage ./block_router { };
 
   dhallGenode = dhallPackages.genode;