diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index ae84ed854..4fd5f8086 100644
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -15,13 +15,13 @@ endif
 
 
 PKG_NAME:=avahi
-PKG_VERSION:=0.6.30
-PKG_RELEASE:=4
+PKG_VERSION:=0.6.31
+PKG_RELEASE:=1
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://avahi.org/download/
-PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43
+PKG_MD5SUM:=2f22745b8f7368ad5a0a3fddac343f2d
 
 PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus
 
diff --git a/libs/avahi/patches/020-automake-compat.patch b/libs/avahi/patches/020-automake-compat.patch
deleted file mode 100644
index 042c9c8bb..000000000
--- a/libs/avahi/patches/020-automake-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/service-type-database/Makefile.am
-+++ b/service-type-database/Makefile.am
-@@ -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 @@ endif
- 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' \