diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index 481bdb712bbd..8ec26c9826eb 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -16,8 +16,6 @@ let
     disable-publishing=${if publishing then "no" else "yes"}
   '';
 
-  avahiUid = (import ../system/ids.nix).uids.avahi;
-
 in
 
 {
@@ -31,6 +29,12 @@ in
     }
   ];
 
+  groups = [
+    { name = "avahi";
+      gid = (import ../system/ids.nix).gids.avahi;
+    }
+  ];
+
   job = ''
     start on startup
     stop on shutdown
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fcf15c74a5dc..fd132621b827 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -277,7 +277,8 @@ let
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
       dbusServices =
-        pkgs.lib.optional (config.services.hal.enable) pkgs.hal;
+        pkgs.lib.optional (config.services.hal.enable) pkgs.hal ++
+	pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi;
     })
 
   # HAL daemon.