diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index f0e6b64103c..54301dadf44 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -25,7 +25,7 @@ let
 
     sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
 
-    buildInputs = [pkgs.libxml2New pkgs.libxslt];
+    buildInputs = [pkgs.libxml2 pkgs.libxslt];
 
     xsltFlags = ''
       --param section.autolabel 1
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 4011c3b3335..8e1d9bd4d10 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -7,8 +7,7 @@ let
 
   cfg = config.services.dbus;
 
-  # !!! dbus_temp uses /etc/dbus-1; will be merged into pkgs.dbus later.
-  dbus = pkgs.dbus_temp;
+  inherit (pkgs) dbus;
 
   homeDir = "/var/run/dbus";