diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix b/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix
new file mode 100644
index 000000000000..946f8427b87a
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "sbin/reboot";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix
index 15c602455866..7dd7125a8823 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix
@@ -1,8 +1,17 @@
-{ mkDerivation }:
+{
+  mkDerivation,
+  reboot,
+  wall,
+}:
 mkDerivation {
   path = "sbin/shutdown";
 
-  preBuild = ''
-    sed -i 's/4550/0550/' Makefile
+  postPatch = ''
+    sed -i 's/4550/0550/' $BSDSRCDIR/sbin/shutdown/Makefile
+
+    substituteInPlace $BSDSRCDIR/sbin/shutdown/pathnames.h \
+      --replace-fail /sbin/halt ${reboot}/bin/halt \
+      --replace-fail /sbin/reboot ${reboot}/bin/reboot \
+      --replace-fail /usr/bin/wall ${wall}/bin/wall
   '';
 }
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix b/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix
new file mode 100644
index 000000000000..a579efb9a8d5
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix
@@ -0,0 +1,9 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/wall";
+
+  postPatch = ''
+    sed -i /BINMODE/d $BSDSRCDIR/usr.bin/wall/Makefile
+    sed -i /BINGRP/d $BSDSRCDIR/usr.bin/wall/Makefile
+  '';
+}