diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 49b71ff99748..7075874adf87 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -67,8 +67,8 @@ self = stdenv.mkDerivation {
     installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ];
 
     postInstall = ''
-      mkdir -p $doc/share/xml/dbus
-      cp doc/*.dtd $doc/share/xml/dbus
+      mkdir -p "$out/share/xml/dbus"
+      cp doc/*.dtd "$out/share/xml/dbus"
     '';
 
     # it's executed from $lib by absolute path
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index a45b4b5443c5..d836d87efef8 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -20,7 +20,7 @@ runCommand "dbus-1"
       <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
         <rewriteSystem
           systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/"
-          rewritePrefix="file://${dbus.doc}/share/xml/dbus/"/>
+          rewritePrefix="file://${dbus}/share/xml/dbus/"/>
       </catalog>
     '';
   }