diff --git a/pkgs/development/libraries/avahi/0.6.21.nix b/pkgs/development/libraries/avahi/0.6.21.nix
deleted file mode 100644
index 26f03ca58bf..00000000000
--- a/pkgs/development/libraries/avahi/0.6.21.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "0q954lwhr6xnv7chhi4bqlmkn4nx9shyw0mbdr3n26018dgw65yq" args
diff --git a/pkgs/development/libraries/avahi/0.6.22.nix b/pkgs/development/libraries/avahi/0.6.22.nix
deleted file mode 100644
index 93b7184cdae..00000000000
--- a/pkgs/development/libraries/avahi/0.6.22.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "0lnxzsdhihb3kjwd3vcrl9pq6ykfbp0vy9ja0mch01ffnrqgiilx" args
diff --git a/pkgs/development/libraries/avahi/common.nix b/pkgs/development/libraries/avahi/default.nix
similarity index 69%
rename from pkgs/development/libraries/avahi/common.nix
rename to pkgs/development/libraries/avahi/default.nix
index a44c2863cc9..0db32ec6858 100644
--- a/pkgs/development/libraries/avahi/common.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,15 +1,20 @@
-sha256: args: with args;
+{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
+, expat, gettext, intltool, glib, gtk, qt4 ? null, lib
+, qt4Support ? false }:
 
 assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "avahi-" + version;
+  name = "avahi-0.6.24";
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    inherit sha256;
+    sha256 = "0l5rsi4s7az7cs9p4aqs77v7jrh95iiwwx0ivksmivc8c7a70016";
   };
 
-  buildInputs = [pkgconfig libdaemon dbus perl perlXMLParser glib expat]
+  buildInputs = [
+      pkgconfig libdaemon dbus perl perlXMLParser glib expat
+      gettext intltool
+    ]
     ++ lib.optional qt4Support qt4;
 
   configureFlags = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62a635361bc..7b92720c7e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -509,14 +509,11 @@ let
   };
 
   avahi =
-    # XXX: Versions prior to 0.6.22 did not support Qt4, so enabling
-    # Qt4 should not be permitted when using a version of Avahi older
-    # than 0.6.22, hence the default to `false'.
     let qt4Support = getConfig [ "avahi" "qt4Support" ] false;
     in
-      selectVersion ../development/libraries/avahi "0.6.22" {
+      import ../development/libraries/avahi {
         inherit stdenv fetchurl pkgconfig libdaemon dbus perl perlXMLParser
-          expat lib;
+          expat gettext intltool lib;
         inherit (gtkLibs) glib gtk;
         inherit qt4Support;
         qt4 = if qt4Support then qt4 else null;