diff --git a/packages/network/avahi/meta b/packages/network/avahi/meta
index 54ddbe7a0c..366868d392 100644
--- a/packages/network/avahi/meta
+++ b/packages/network/avahi/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="avahi"
-PKG_VERSION="0.6.30"
+PKG_VERSION="0.6.31"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/network/avahi/patches/avahi-0.6.30-automake.patch b/packages/network/avahi/patches/avahi-0.6.30-automake.patch
deleted file mode 100644
index bcd7c1117d..0000000000
--- a/packages/network/avahi/patches/avahi-0.6.30-automake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur avahi-0.6.30/service-type-database/Makefile.am avahi-0.6.30.patch/service-type-database/Makefile.am
---- avahi-0.6.30/service-type-database/Makefile.am	2010-06-29 05:30:35.000000000 +0200
-+++ avahi-0.6.30.patch/service-type-database/Makefile.am	2012-01-16 09:44:27.232178796 +0100
-@@ -18,13 +18,12 @@
- EXTRA_DIST=build-db.in service-types
- 
- pkgdata_DATA=service-types
--pkglib_DATA=
- 
- if HAVE_PYTHON
- if HAVE_GDBM
- 
- noinst_SCRIPTS=build-db
--pkglib_DATA+=service-types.db
-+pkgdata_DATA+=service-types.db
- 
- build-db: build-db.in
- 	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
-@@ -41,7 +40,7 @@
- if HAVE_DBM
- 
- noinst_SCRIPTS=build-db
--pkglib_DATA+=service-types.db.pag service-types.db.dir
-+pkgdata_DATA+=service-types.db.pag service-types.db.dir
- 
- build-db: build-db.in
- 	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
diff --git a/packages/network/avahi/patches/avahi-0.6.31-automake.patch b/packages/network/avahi/patches/avahi-0.6.31-automake.patch
new file mode 100644
index 0000000000..d4ae0bc728
--- /dev/null
+++ b/packages/network/avahi/patches/avahi-0.6.31-automake.patch
@@ -0,0 +1,12 @@
+diff -Naur avahi-0.6.31/avahi-daemon/Makefile.am avahi-0.6.31.patch/avahi-daemon/Makefile.am
+--- avahi-0.6.31/avahi-daemon/Makefile.am	2010-08-26 02:51:38.000000000 +0200
++++ avahi-0.6.31.patch/avahi-daemon/Makefile.am	2012-06-13 18:44:23.910169467 +0200
+@@ -169,7 +169,7 @@
+ 	done
+ 
+ install-data-local:
+-	test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
++	test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
+ 
+ update-systemd:
+ 	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c