6 files changed, 8 insertions, 8 deletions
diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix
index 6e9a5eb7..5b1c7bb4 100644
--- a/machines/devhell/eir.nix
+++ b/machines/devhell/eir.nix
@@ -195,7 +195,7 @@
     libva
     libvdpau-va-gl
     minicom
-    pmtools
+    acpica-tools
     pmutils
     vaapiVdpau
     vdpauinfo
diff --git a/machines/devhell/herja.nix b/machines/devhell/herja.nix
index 5e58fb80..fb1583e6 100644
--- a/machines/devhell/herja.nix
+++ b/machines/devhell/herja.nix
@@ -171,14 +171,14 @@
   };
 
   environment.systemPackages = with pkgs; [
-    aircrackng
+    aircrack-ng
     fwupd
     horst
     ipmitool
     iw
     libva
     minicom
-    pmtools
+    acpica-tools
     pmutils
     teams
     vaapiVdpau
diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix
index a8139654..419b3383 100644
--- a/machines/devhell/hildr.nix
+++ b/machines/devhell/hildr.nix
@@ -182,7 +182,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    aircrackng
+    aircrack-ng
     cdrtools
     dvdplusrwtools
     horst
@@ -191,7 +191,7 @@
     libva
     libvdpau-va-gl
     minicom
-    pmtools
+    acpica-tools
     pmutils
     reaverwps
     snort
diff --git a/modules/user/aszlig/profiles/managed.nix b/modules/user/aszlig/profiles/managed.nix
index 138cf095..d54aeddd 100644
--- a/modules/user/aszlig/profiles/managed.nix
+++ b/modules/user/aszlig/profiles/managed.nix
@@ -50,7 +50,7 @@ in {
       pkgs.thunderbird
       pkgs.vuizvui.aszlig.vim
       pkgs.wine
-      pkgs.youtubeDL
+      pkgs.youtube-dl
       unfreeAndNonDistributablePkgs.skype
     ];
 
diff --git a/modules/user/openlab/base.nix b/modules/user/openlab/base.nix
index 61e022f8..9c20e3d6 100644
--- a/modules/user/openlab/base.nix
+++ b/modules/user/openlab/base.nix
@@ -42,7 +42,7 @@ in
 
     environment.systemPackages = with pkgs; let
       base = [
-        ack ag
+        ack silver-searcher
         fish
         git
         man-pages
diff --git a/release.nix b/release.nix
index b07d502d..37e108e7 100644
--- a/release.nix
+++ b/release.nix
@@ -172,7 +172,7 @@ in with pkgsUpstream.lib; with builtins; {
       inherit system;
     };
 
-    patchedDocbookXSL = overrideDerivation pkgsUpstream.docbook5_xsl (drv: {
+    patchedDocbookXSL = overrideDerivation pkgsUpstream.docbook5_xsl_ns (drv: {
       # Don't chunk off <preface/>
       postPatch = (drv.postPatch or "") + ''
         sed -i -e '