diff --git a/recipes/avahi/files/configure-check-pymod.patch b/recipes/avahi/avahi-python/configure-check-pymod.patch
similarity index 100%
rename from recipes/avahi/files/configure-check-pymod.patch
rename to recipes/avahi/avahi-python/configure-check-pymod.patch
diff --git a/recipes/avahi/files/dbus-pre-1.1.1-support.patch b/recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch
similarity index 100%
rename from recipes/avahi/files/dbus-pre-1.1.1-support.patch
rename to recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch
diff --git a/recipes/avahi/avahi-ui_0.6.21.bb b/recipes/avahi/avahi-ui_0.6.21.bb
deleted file mode 100644
index e3e5e5be99..0000000000
--- a/recipes/avahi/avahi-ui_0.6.21.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require avahi.inc
-PR = "${INC_PR}.0"
-
-DEPENDS += "avahi gtk+"
-
-SRC_URI += "file://dbus-pre-1.1.1-support.patch"
-AVAHI_GTK = "--enable-gtk"
-
-S = "${WORKDIR}/avahi-${PV}"
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/avahi-ui
-	cp ${S}/avahi-ui/*.h ${STAGING_INCDIR}/avahi-ui/
-        oe_libinstall -C avahi-ui -a -so libavahi-ui ${STAGING_LIBDIR}
-}
-
-PACKAGES = "${PN} ${PN}-dbg"
-
-FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
-FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*"
-
-SRC_URI[md5sum] = "9cc68f79c50c9dd9e419990c3c9b05b9"
-SRC_URI[sha256sum] = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561"
diff --git a/recipes/avahi/avahi_0.6.19.bb b/recipes/avahi/avahi_0.6.19.bb
deleted file mode 100644
index 6a6825c4e3..0000000000
--- a/recipes/avahi/avahi_0.6.19.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require avahi.inc
-
-PR = "${INC_PR}.0"
-SRC_URI[md5sum] = "a06782435d1c994ecd00a66e95a5d9d4"
-SRC_URI[sha256sum] = "a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a"
diff --git a/recipes/avahi/avahi_0.6.21.bb b/recipes/avahi/avahi_0.6.21.bb
deleted file mode 100644
index 5372334336..0000000000
--- a/recipes/avahi/avahi_0.6.21.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require avahi.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://dbus-pre-1.1.1-support.patch"
-SRC_URI += "file://avr32-ipv6-fix.patch"
-
-SRC_URI[md5sum] = "9cc68f79c50c9dd9e419990c3c9b05b9"
-SRC_URI[sha256sum] = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561"
diff --git a/recipes/avahi/avahi_0.6.22.bb b/recipes/avahi/avahi_0.6.22.bb
deleted file mode 100644
index 6e9608ae19..0000000000
--- a/recipes/avahi/avahi_0.6.22.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require avahi.inc
-
-DEPENDS += "intltool-native"
-PR = "${INC_PR}.0"
-
-PACKAGES =+ "libavahi-gobject"
-
-SRC_URI[md5sum] = "c84b1a8a23126e188426728710414dc8"
-SRC_URI[sha256sum] = "9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52"
diff --git a/recipes/avahi/avahi_0.6.23.bb b/recipes/avahi/avahi_0.6.23.bb
deleted file mode 100644
index abf0fbf3d9..0000000000
--- a/recipes/avahi/avahi_0.6.23.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require avahi.inc
-
-PR = "${INC_PR}.0"
-DEPENDS += "intltool-native"
-
-PACKAGES =+ "libavahi-gobject"
-
-SRC_URI[md5sum] = "aab1a304851d8145ea5f6a85c10af9e9"
-SRC_URI[sha256sum] = "dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d"
diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb
deleted file mode 100644
index 786f58ffdc..0000000000
--- a/recipes/avahi/avahi_0.6.24.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require avahi.inc
-
-PR = "${INC_PR}.0"
-
-DEPENDS += "intltool-native"
-
-PACKAGES =+ "libavahi-gobject"
-
-SRC_URI[md5sum] = "068c1d220b07037e64caf87d4a7a0504"
-SRC_URI[sha256sum] = "260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950"
diff --git a/recipes/avahi/files/avr32-ipv6-fix.patch b/recipes/avahi/files/avr32-ipv6-fix.patch
deleted file mode 100644
index f0710a1002..0000000000
--- a/recipes/avahi/files/avr32-ipv6-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- /tmp/socket.c	2007-09-14 14:03:01.395330465 +0200
-+++ avahi-0.6.21/avahi-core/socket.c	2007-09-14 14:08:42.081140297 +0200
-@@ -66,6 +66,39 @@
- #endif
- #endif
- 
-+#define IPV6_ADDRFORM           1
-+#define IPV6_2292PKTINFO        2
-+#define IPV6_2292HOPOPTS        3
-+#define IPV6_2292DSTOPTS        4
-+#define IPV6_2292RTHDR          5
-+#define IPV6_2292PKTOPTIONS     6
-+#define IPV6_CHECKSUM           7
-+#define IPV6_2292HOPLIMIT       8
-+#define IPV6_NEXTHOP            9
-+#define IPV6_AUTHHDR            10      /* obsolete */
-+#define IPV6_FLOWINFO           11
-+
-+#define IPV6_UNICAST_HOPS       16
-+#define IPV6_MULTICAST_IF       17
-+#define IPV6_MULTICAST_HOPS     18
-+#define IPV6_MULTICAST_LOOP     19
-+#define IPV6_ADD_MEMBERSHIP     20
-+#define IPV6_DROP_MEMBERSHIP    21
-+#define IPV6_ROUTER_ALERT       22
-+#define IPV6_MTU_DISCOVER       23
-+#define IPV6_MTU                24
-+#define IPV6_RECVERR            25
-+#define IPV6_V6ONLY             26
-+#define IPV6_JOIN_ANYCAST       27
-+#define IPV6_LEAVE_ANYCAST      28
-+
-+/* IPV6_MTU_DISCOVER values */
-+#define IPV6_PMTUDISC_DONT              0
-+#define IPV6_PMTUDISC_WANT              1
-+#define IPV6_PMTUDISC_DO                2
-+#define IPV6_PMTUDISC_PROBE             3
-+
-+
- static void mdns_mcast_group_ipv4(struct sockaddr_in *ret_sa) {
-     assert(ret_sa);
-