diff --git a/0001-Python3-support.patch b/0001-Python3-support.patch
new file mode 100644
index 0000000..0bd6c64
--- /dev/null
+++ b/0001-Python3-support.patch
@@ -0,0 +1,51 @@
+From 2ab8bc4d4d393d74dacd23b525715fca7356f996 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 16 Jun 2015 20:39:36 +0200
+Subject: [PATCH] Python3 support
+
+---
+ avahi-python/avahi/ServiceTypeDatabase.py.in | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
+index b2035fd..4ddd654 100644
+--- a/avahi-python/avahi/ServiceTypeDatabase.py.in
++++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
+@@ -138,24 +138,24 @@ class ServiceTypeDatabase:
+ if __name__ == "__main__":
+ 
+     b = ServiceTypeDatabase()
+-    print b.items()
++    print (b.items())
+ 
+-    print b["_http._tcp"]
+-    print b["_ftp._tcp"]
+-    print b["_webdav._tcp"]
+-    print b["_webdavs._tcp"]
++    print (b["_http._tcp"])
++    print (b["_ftp._tcp"])
++    print (b["_webdav._tcp"])
++    print (b["_webdavs._tcp"])
+ 
+-    print b.get("gurki._tcp")
+-    print len(b)
++    print (b.get("gurki._tcp"))
++    print (len(b))
+ 
+     for key, _ in zip(b, xrange(3)):
+ 
+-        print key
++        print (key)
+ 
+     for key, _ in zip(b.iteritems(), xrange(3)):
+ 
+-        print key
++        print (key)
+ 
+     for key, _ in zip(b.itervalues(), xrange(3)):
+ 
+-        print key
++        print (key)
+-- 
+2.4.3
+
diff --git a/0001-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch b/0001-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch
new file mode 100644
index 0000000..63ebf52
--- /dev/null
+++ b/0001-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch
@@ -0,0 +1,26 @@
+From 938b5f883fbaa642e3acb7720e37f95f3d72be62 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 2 Apr 2012 21:17:19 +0200
+Subject: [PATCH 1/8] avahi-daemon: don't add 0pointer.de and zeroconf.org to
+ default browse list
+
+---
+ avahi-daemon/avahi-daemon.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
+index c992842..1906590 100644
+--- a/avahi-daemon/avahi-daemon.conf
++++ b/avahi-daemon/avahi-daemon.conf
+@@ -21,7 +21,7 @@
+ [server]
+ #host-name=foo
+ #domain-name=local
+-browse-domains=0pointer.de, zeroconf.org
++#browse-domains=0pointer.de, zeroconf.org
+ use-ipv4=yes
+ use-ipv6=no
+ #allow-interfaces=eth0
+-- 
+1.9.3
+
diff --git a/0001-netlink-check-that-the-origin-of-the-rtnetlink-messa.patch b/0001-netlink-check-that-the-origin-of-the-rtnetlink-messa.patch
new file mode 100644
index 0000000..bd2186a
--- /dev/null
+++ b/0001-netlink-check-that-the-origin-of-the-rtnetlink-messa.patch
@@ -0,0 +1,41 @@
+From b8b2b4a03de019e14e439d30ab2d929aec5d6524 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Mon, 1 Jun 2015 21:13:40 +0200
+Subject: [PATCH] netlink: check that the origin of the rtnetlink messages is
+ kernel
+
+Instead of asserting it's from UID 0, which breaks in network namespaces.
+---
+ avahi-autoipd/iface-linux.c | 2 +-
+ avahi-core/netlink.c        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c
+index 83e9e41..1888e37 100644
+--- a/avahi-autoipd/iface-linux.c
++++ b/avahi-autoipd/iface-linux.c
+@@ -215,7 +215,7 @@ static int process_response(int wait_for_done, unsigned seq) {
+ 
+         ucred = (struct ucred*) CMSG_DATA(cmsghdr);
+ 
+-        if (ucred->uid != 0)
++        if (ucred->pid != 0)
+             return -1;
+ 
+         bytes = (size_t) r;
+diff --git a/avahi-core/netlink.c b/avahi-core/netlink.c
+index 4ded5ec..b8c0c06 100644
+--- a/avahi-core/netlink.c
++++ b/avahi-core/netlink.c
+@@ -82,7 +82,7 @@ int avahi_netlink_work(AvahiNetlink *nl, int block) {
+ 
+     cred = (struct ucred*) CMSG_DATA(cmsg);
+ 
+-    if (cred->uid != 0)
++    if (cred->pid != 0)
+         return -1;
+ 
+     p = (struct nlmsghdr *) nl->buffer;
+-- 
+2.4.3
+
diff --git a/0002-avahi-daemon-don-t-leak-host-info-by-default.patch b/0002-avahi-daemon-don-t-leak-host-info-by-default.patch
new file mode 100644
index 0000000..442a261
--- /dev/null
+++ b/0002-avahi-daemon-don-t-leak-host-info-by-default.patch
@@ -0,0 +1,27 @@
+From 530fbb59abafb970ef1dd8f61571b13fb0918b23 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 2 Apr 2012 21:17:36 +0200
+Subject: [PATCH 2/8] avahi-daemon: don't leak host info by default
+
+---
+ avahi-daemon/avahi-daemon.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
+index 1906590..27e240d 100644
+--- a/avahi-daemon/avahi-daemon.conf
++++ b/avahi-daemon/avahi-daemon.conf
+@@ -46,8 +46,8 @@ enable-wide-area=yes
+ #disable-user-service-publishing=no
+ #add-service-cookie=no
+ #publish-addresses=yes
+-#publish-hinfo=yes
+-#publish-workstation=yes
++publish-hinfo=no
++publish-workstation=no
+ #publish-domain=yes
+ #publish-dns-servers=192.168.50.1, 192.168.50.2
+ #publish-resolv-conf-dns-servers=yes
+-- 
+1.9.3
+
diff --git a/0003-core-don-t-leak-hinfo-workstation-even-if-the-config.patch b/0003-core-don-t-leak-hinfo-workstation-even-if-the-config.patch
new file mode 100644
index 0000000..69c6247
--- /dev/null
+++ b/0003-core-don-t-leak-hinfo-workstation-even-if-the-config.patch
@@ -0,0 +1,52 @@
+From 468519681b09f00851e1d4dd658b939e4e938cf6 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 2 Apr 2012 21:20:34 +0200
+Subject: [PATCH 3/8] core: don't leak hinfo/workstation even if the
+ configuration file doesn't exist
+
+---
+ avahi-core/server.c            | 4 ++--
+ man/avahi-daemon.conf.5.xml.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index 86fd4a5..69a1d02 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -1582,9 +1582,9 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) {
+     c->host_name = NULL;
+     c->domain_name = NULL;
+     c->check_response_ttl = 0;
+-    c->publish_hinfo = 1;
++    c->publish_hinfo = 0;
+     c->publish_addresses = 1;
+-    c->publish_workstation = 1;
++    c->publish_workstation = 0;
+     c->publish_domain = 1;
+     c->use_iff_running = 0;
+     c->enable_reflector = 0;
+diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
+index 487645b..bea7ed5 100644
+--- a/man/avahi-daemon.conf.5.xml.in
++++ b/man/avahi-daemon.conf.5.xml.in
+@@ -244,7 +244,7 @@
+       useful for administrative purposes. This is recommended by the
+       mDNS specification but not required. For the sake of privacy
+       you might choose to disable this feature. Defaults to
+-      "yes."</p>
++      "no".</p>
+     </option>
+ 
+     <option>
+@@ -254,7 +254,7 @@
+       might be useful for administrative purposes (i.e. browse for
+       all PCs on the LAN), but is not required or recommended by any
+       specification. Newer MacOS X releases register a service of
+-      this type. Defaults to "yes".</p>
++      this type. Defaults to "no".</p>
+     </option>
+ 
+     <option>
+-- 
+1.9.3
+
diff --git a/0004-build-sys-fix-MKDIR_P-for-recent-automake.patch b/0004-build-sys-fix-MKDIR_P-for-recent-automake.patch
new file mode 100644
index 0000000..4d9becb
--- /dev/null
+++ b/0004-build-sys-fix-MKDIR_P-for-recent-automake.patch
@@ -0,0 +1,52 @@
+From 8070ec2ac51219c462ac05238eab239461c38454 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 7 Jun 2012 16:51:10 +0200
+Subject: [PATCH 4/8] build-sys: fix MKDIR_P for recent automake
+
+---
+ avahi-autoipd/Makefile.am | 2 +-
+ avahi-daemon/Makefile.am  | 2 +-
+ configure.ac              | 1 +
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/avahi-autoipd/Makefile.am b/avahi-autoipd/Makefile.am
+index 263e991..56f7a35 100644
+--- a/avahi-autoipd/Makefile.am
++++ b/avahi-autoipd/Makefile.am
+@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dhclient-enter-hooks.d
+ dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d
+ 
+ install-exec-hook: dhclient-exit-hook dhclient-enter-hook
+-	$(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
++	$(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
+ 	$(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
+ 	$(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
+ 
+diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
+index b5d2bf4..b6b5a77 100644
+--- a/avahi-daemon/Makefile.am
++++ b/avahi-daemon/Makefile.am
+@@ -169,7 +169,7 @@ xmllint:
+ 	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
+diff --git a/configure.ac b/configure.ac
+index 0e190ba..9debce2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,7 @@ AC_PROG_CXX
+ AM_PROG_CC_C_O
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_CPP
++AC_PROG_MKDIR_P
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-- 
+1.9.3
+
diff --git a/0005-build-sys-fix-parallel-install-in-avahi-utils.patch b/0005-build-sys-fix-parallel-install-in-avahi-utils.patch
new file mode 100644
index 0000000..4bdce72
--- /dev/null
+++ b/0005-build-sys-fix-parallel-install-in-avahi-utils.patch
@@ -0,0 +1,29 @@
+From a485019966c32af05fb294fb4e20f1d3a82f3fbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sun, 17 Jun 2012 07:44:01 -0700
+Subject: [PATCH 5/8] build-sys: fix parallel install in avahi-utils
+
+The moment install-exec-local is called, we might still not have
+created ${DESTDIR}/${bindir} so we should make sure to create it
+first, and then try to chdir into it.
+---
+ avahi-utils/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
+index a644b4a..1abc79a 100644
+--- a/avahi-utils/Makefile.am
++++ b/avahi-utils/Makefile.am
+@@ -54,7 +54,8 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
+ avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+ 
+ install-exec-local:
+-	cd $(DESTDIR)/$(bindir) && \
++	$(mkdir_p) $(DESTDIR)/$(bindir) && \
++		cd $(DESTDIR)/$(bindir) && \
+ 		rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
+ 		$(LN_S) avahi-resolve avahi-resolve-host-name && \
+ 		$(LN_S) avahi-resolve avahi-resolve-address && \
+-- 
+1.9.3
+
diff --git a/0006-build-sys-fix-previous-commit-for-recent-automake.patch b/0006-build-sys-fix-previous-commit-for-recent-automake.patch
new file mode 100644
index 0000000..2869854
--- /dev/null
+++ b/0006-build-sys-fix-previous-commit-for-recent-automake.patch
@@ -0,0 +1,25 @@
+From 35ea8dc8954eebd63aad7157d02f97388f679122 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Tue, 19 Jun 2012 15:50:35 +0200
+Subject: [PATCH 6/8] build-sys: fix previous commit for recent automake
+
+---
+ avahi-utils/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
+index 1abc79a..66c4cc6 100644
+--- a/avahi-utils/Makefile.am
++++ b/avahi-utils/Makefile.am
+@@ -54,7 +54,7 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
+ avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+ 
+ install-exec-local:
+-	$(mkdir_p) $(DESTDIR)/$(bindir) && \
++	$(MKDIR_P) $(DESTDIR)/$(bindir) && \
+ 		cd $(DESTDIR)/$(bindir) && \
+ 		rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
+ 		$(LN_S) avahi-resolve avahi-resolve-host-name && \
+-- 
+1.9.3
+
diff --git a/0007-avahi-common-typo-fix.patch b/0007-avahi-common-typo-fix.patch
new file mode 100644
index 0000000..0aa0ba2
--- /dev/null
+++ b/0007-avahi-common-typo-fix.patch
@@ -0,0 +1,477 @@
+From ccfcd5c42c68752fbd6de318fe5ce4269f5a7c06 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 7 Sep 2012 16:17:43 +0200
+Subject: [PATCH 7/8] avahi-common: typo fix
+
+---
+ avahi-common/error.c |   2 +-
+ avahi-common/error.h |   2 +-
+ po/bg.po             |   2 +-
+ po/ca.po             |   2 +-
+ po/cs.po             |   2 +-
+ po/da.po             |   2 +-
+ po/de.po             |   2 +-
+ po/el.po             |   2 +-
+ po/en_AU.po          |   2 +-
+ po/en_CA.po          |   2 +-
+ po/en_GB.po          |   2 +-
+ po/en_NZ.po          | 859 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ po/es.po             |   2 +-
+ po/fi.po             |   2 +-
+ po/fo.po             |   2 +-
+ po/fr.po             |   2 +-
+ po/gl.po             |   2 +-
+ po/he.po             |   2 +-
+ po/hu.po             |   2 +-
+ po/id.po             |   2 +-
+ po/it.po             |   2 +-
+ po/ja.po             |   2 +-
+ po/ms.po             |   2 +-
+ po/nl.po             |   2 +-
+ po/pl.po             |   2 +-
+ po/pt_BR.po          |   2 +-
+ po/ro.po             |   2 +-
+ po/ru.po             |   2 +-
+ po/sl.po             |   2 +-
+ po/sl.si             |   2 +-
+ po/sr.po             |   2 +-
+ po/sr@latin.po       |   2 +-
+ po/sv.po             |   2 +-
+ po/uk.po             |   2 +-
+ po/zh_CN.po          |   2 +-
+ po/zh_TW.po          |   2 +-
+ 36 files changed, 893 insertions(+), 36 deletions(-)
+ mode change 120000 => 100644 po/en_NZ.po
+
+diff --git a/avahi-common/error.c b/avahi-common/error.c
+index b0b66ea..63c5033 100644
+--- a/avahi-common/error.c
++++ b/avahi-common/error.c
+@@ -51,7 +51,7 @@ const char *avahi_strerror(int error) {
+ 
+         N_("Access denied"),
+         N_("Invalid operation"),
+-        N_("An unexpected D-Bus error occured"),
++        N_("An unexpected D-Bus error occurred"),
+         N_("Daemon connection failed"),
+         N_("Memory exhausted"),
+         N_("The object passed in was not valid"),
+diff --git a/avahi-common/error.h b/avahi-common/error.h
+index 392aaf5..94511c9 100644
+--- a/avahi-common/error.h
++++ b/avahi-common/error.h
+@@ -52,7 +52,7 @@ enum {
+ 
+     AVAHI_ERR_ACCESS_DENIED = -20,           /**< Access denied */
+     AVAHI_ERR_INVALID_OPERATION = -21,       /**< Invalid operation */
+-    AVAHI_ERR_DBUS_ERROR = -22,              /**< An unexpected D-Bus error occured */
++    AVAHI_ERR_DBUS_ERROR = -22,              /**< An unexpected D-Bus error occurred */
+     AVAHI_ERR_DISCONNECTED = -23,            /**< Daemon connection failed */
+     AVAHI_ERR_NO_MEMORY = -24,               /**< Memory exhausted */
+     AVAHI_ERR_INVALID_OBJECT = -25,          /**< The object passed to this function was invalid */
+diff --git a/po/bg.po b/po/bg.po
+index c20eb6d..f59d43a 100644
+--- a/po/bg.po
++++ b/po/bg.po
+@@ -106,7 +106,7 @@ msgid "Invalid operation"
+ msgstr "Неправилна операция"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Неочаквана грешка от D-Bus"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/ca.po b/po/ca.po
+index 0985254..d3cff9c 100644
+--- a/po/ca.po
++++ b/po/ca.po
+@@ -118,7 +118,7 @@ msgid "Invalid operation"
+ msgstr "Operació no vàlida"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "S'ha produït un error inesperat al D-Bus"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/cs.po b/po/cs.po
+index c6c8e85..349bfbe 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -111,7 +111,7 @@ msgstr "Neplatná operace"
+ 
+ #: ../avahi-common/error.c:54
+ #, fuzzy
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Došlo k následující chybě:"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/da.po b/po/da.po
+index 9984965..0b231cb 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -115,7 +115,7 @@ msgid "Invalid operation"
+ msgstr "Ugyldig handling"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Der opstod en uventet D-Bus-fejl"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/de.po b/po/de.po
+index e4ee917..5b0a017 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -108,7 +108,7 @@ msgid "Invalid operation"
+ msgstr "Ungültige Operation"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Ein unerwarteter DBus-Fehler ist aufgetreten"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/el.po b/po/el.po
+index 2f095ee..53c53fb 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr "Λανθασμένη λειτουργία"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr ""
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/en_AU.po b/po/en_AU.po
+index e510292..5e8918d 100644
+--- a/po/en_AU.po
++++ b/po/en_AU.po
+@@ -102,7 +102,7 @@ msgid "Invalid operation"
+ msgstr ""
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr ""
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/en_CA.po b/po/en_CA.po
+index 2d70852..3c28764 100644
+--- a/po/en_CA.po
++++ b/po/en_CA.po
+@@ -102,7 +102,7 @@ msgid "Invalid operation"
+ msgstr ""
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr ""
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/en_GB.po b/po/en_GB.po
+index 4f5b849..aab6526 100644
+--- a/po/en_GB.po
++++ b/po/en_GB.po
+@@ -105,7 +105,7 @@ msgid "Invalid operation"
+ msgstr "Invalid operation"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "An unexpected D-Bus error occurred"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/es.po b/po/es.po
+index 4d4fef7..56974da 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -112,7 +112,7 @@ msgid "Invalid operation"
+ msgstr "Operación no válida"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Ocurrió un error de D-Bus no esperado"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/fi.po b/po/fi.po
+index cbd0883..d37ec3a 100644
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr "Virheellinen toiminto"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Tapahtui odottamaton D-Bus-virhe"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/fo.po b/po/fo.po
+index ff470a2..8b122af 100644
+--- a/po/fo.po
++++ b/po/fo.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr "Ógildug atgerð"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Ein óvantað D-BUS villa hendi"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/fr.po b/po/fr.po
+index 144756a..59143da 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -111,7 +111,7 @@ msgid "Invalid operation"
+ msgstr "Opération invalide "
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Une erreur inattendue de D-Bus s'est produite"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/gl.po b/po/gl.po
+index f1da293..46f8a8f 100644
+--- a/po/gl.po
++++ b/po/gl.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr "Operación incorrecta"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Produciuse un erro inesperado de D-BUS"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/he.po b/po/he.po
+index 6f4070b..f5a50c7 100644
+--- a/po/he.po
++++ b/po/he.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr "פעולה שגויה"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "ארעה שגיאת D-Bus לא ידועה"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/hu.po b/po/hu.po
+index 138875e..800b90e 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr "Érvénytelen művelet"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Váratlan D-Bus hiba történt"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/id.po b/po/id.po
+index 1d56baa..453086a 100644
+--- a/po/id.po
++++ b/po/id.po
+@@ -108,7 +108,7 @@ msgid "Invalid operation"
+ msgstr "Operasi tidak valid"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Terjadi galat D-Bus yang tak diharapkan"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/it.po b/po/it.po
+index fbb51c1..1448cd3 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -114,7 +114,7 @@ msgid "Invalid operation"
+ msgstr "Operazione non valida"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Si è verificato un errore D-Bus inatteso"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/ja.po b/po/ja.po
+index 7f76ff6..ec3a05c 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -106,7 +106,7 @@ msgid "Invalid operation"
+ msgstr "不正な操作です"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "予期しない D-Bus のエラーが発生しました"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/ms.po b/po/ms.po
+index e9267f2..58db564 100644
+--- a/po/ms.po
++++ b/po/ms.po
+@@ -121,7 +121,7 @@ msgstr "Tanda operasi:"
+ 
+ #: ../avahi-common/error.c:54
+ #, fuzzy
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr ""
+ "Ralat tidak dijangka telah berlaku:\n"
+ "%s"
+diff --git a/po/nl.po b/po/nl.po
+index aeb7c91..f287d38 100644
+--- a/po/nl.po
++++ b/po/nl.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr ""
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr ""
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/pl.po b/po/pl.po
+index 6328939..a0b2f10 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -103,7 +103,7 @@ msgid "Invalid operation"
+ msgstr "Nieprawidłowe działanie"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Wystąpił nieoczekiwany błąd usługi D-Bus"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 2a38d19..bde3e62 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -110,7 +110,7 @@ msgid "Invalid operation"
+ msgstr "Operação inválida"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Ocorreu um erro inesperado do D-BUS"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/ro.po b/po/ro.po
+index 662fa8f..e270063 100644
+--- a/po/ro.po
++++ b/po/ro.po
+@@ -102,7 +102,7 @@ msgid "Invalid operation"
+ msgstr "Operație nevalidă"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "S-a produs o eroare D-Bus"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/ru.po b/po/ru.po
+index 00e8013..675a1d8 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -110,7 +110,7 @@ msgid "Invalid operation"
+ msgstr "Неверная операция"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Неожиданная ошибка D-Bus"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/sl.po b/po/sl.po
+index e9fed56..ab8e663 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -113,7 +113,7 @@ msgid "Invalid operation"
+ msgstr "Neveljavno dejanje"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Prišlo je do nepričakovane napake vodila D-Bus."
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/sr@latin.po b/po/sr@latin.po
+index 137c73c..be1779c 100644
+--- a/po/sr@latin.po
++++ b/po/sr@latin.po
+@@ -109,7 +109,7 @@ msgid "Invalid operation"
+ msgstr "Netačna operacija"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Desila se neočekivana greška u D-Bus softveru"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/sv.po b/po/sv.po
+index 25abde7..74f9d87 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -105,7 +105,7 @@ msgid "Invalid operation"
+ msgstr "Ogiltig åtgärd"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Ett oväntat D-Bus-fel har inträffat"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/uk.po b/po/uk.po
+index f58c875..76f57fe 100644
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -107,7 +107,7 @@ msgid "Invalid operation"
+ msgstr "Некоректна дія"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "Сталася непередбачена помилка D-Bus"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index d217f7e..de850fa 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -106,7 +106,7 @@ msgid "Invalid operation"
+ msgstr "无效的操作"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "发生了一个未预期的 D-Bus 错误"
+ 
+ #: ../avahi-common/error.c:55
+diff --git a/po/zh_TW.po b/po/zh_TW.po
+index 56ddd8e..696173b 100644
+--- a/po/zh_TW.po
++++ b/po/zh_TW.po
+@@ -105,7 +105,7 @@ msgid "Invalid operation"
+ msgstr "無效的操作"
+ 
+ #: ../avahi-common/error.c:54
+-msgid "An unexpected D-Bus error occured"
++msgid "An unexpected D-Bus error occurred"
+ msgstr "遭遇到未預期的 D-Bus 錯誤"
+ 
+ #: ../avahi-common/error.c:55
+-- 
+1.9.3
+
diff --git a/0008-avahi-daemon-add-option-host-name-from-machine-id.patch b/0008-avahi-daemon-add-option-host-name-from-machine-id.patch
new file mode 100644
index 0000000..4d84bcc
--- /dev/null
+++ b/0008-avahi-daemon-add-option-host-name-from-machine-id.patch
@@ -0,0 +1,89 @@
+From 147cdce70b22ae7cee9fb4fe123db40952f31c9e Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen@chromium.org>
+Date: Tue, 5 Mar 2013 11:52:38 -0800
+Subject: [PATCH 8/8] avahi-daemon: add option "host-name-from-machine-id="
+
+Signed-off-by: David Zeuthen <zeuthen@chromium.org>
+---
+ avahi-daemon/main.c            | 33 +++++++++++++++++++++++++++++++++
+ man/avahi-daemon.conf.5.xml.in |  6 ++++++
+ 2 files changed, 39 insertions(+)
+
+diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
+index d46f40a..8c28fd6 100644
+--- a/avahi-daemon/main.c
++++ b/avahi-daemon/main.c
+@@ -65,6 +65,7 @@
+ #include <avahi-core/publish.h>
+ #include <avahi-core/dns-srv-rr.h>
+ #include <avahi-core/log.h>
++#include <avahi-core/util.h>
+ 
+ #ifdef ENABLE_CHROOT
+ #include "chroot.h"
+@@ -576,6 +577,29 @@ static int parse_usec(const char *s, AvahiUsec *u) {
+     return 0;
+ }
+ 
++static char *get_machine_id(void) {
++    int fd;
++    char buf[32];
++
++    fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
++    if (fd == -1 && errno == ENOENT)
++        fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
++    if (fd == -1)
++        return NULL;
++
++    /* File is on a filesystem so we never get EINTR or partial reads */
++    if (read(fd, buf, sizeof buf) != sizeof buf) {
++        close(fd);
++        return NULL;
++    }
++    close(fd);
++
++    /* Contents can be lower, upper and even mixed case so normalize */
++    avahi_strdown(buf);
++
++    return avahi_strndup(buf, sizeof buf);
++}
++
+ static int load_config_file(DaemonConfig *c) {
+     int r = -1;
+     AvahiIniFile *f;
+@@ -631,6 +655,15 @@ static int load_config_file(DaemonConfig *c) {
+                     c->server_config.use_iff_running = is_yes(p->value);
+                 else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
+                     c->server_config.disallow_other_stacks = is_yes(p->value);
++                else if (strcasecmp(p->key, "host-name-from-machine-id") == 0) {
++                    if (*(p->value) == 'y' || *(p->value) == 'Y') {
++                        char *machine_id = get_machine_id();
++                        if (machine_id != NULL) {
++                            avahi_free(c->server_config.host_name);
++                            c->server_config.host_name = machine_id;
++                        }
++                    }
++                }
+ #ifdef HAVE_DBUS
+                 else if (strcasecmp(p->key, "enable-dbus") == 0) {
+ 
+diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
+index bea7ed5..2d15017 100644
+--- a/man/avahi-daemon.conf.5.xml.in
++++ b/man/avahi-daemon.conf.5.xml.in
+@@ -40,6 +40,12 @@
+     </option>
+ 
+     <option>
++      <p><opt>host-name-from-machine-id=</opt> Takes a boolean
++      value ("yes" or "no"). If set to "yes" avahi-daemon
++      will use the machine-id as name on the LAN.</p>
++    </option>
++
++    <option>
+       <p><opt>domain-name=</opt> Set the default domain name avahi-daemon
+       tries to register its host name and services on the LAN in. If
+       omitted defaults to ".local".</p>
+-- 
+1.9.3
+
diff --git a/avahi-0.6.31-invalid_packet.patch b/avahi-0.6.31-invalid_packet.patch
new file mode 100644
index 0000000..3240a56
--- /dev/null
+++ b/avahi-0.6.31-invalid_packet.patch
@@ -0,0 +1,14 @@
+diff -up avahi-0.6.31/avahi-core/server.c.invalid_packet avahi-0.6.31/avahi-core/server.c
+--- avahi-0.6.31/avahi-core/server.c.invalid_packet	2015-09-17 10:36:58.286843110 -0500
++++ avahi-0.6.31/avahi-core/server.c	2015-09-17 10:38:46.973153235 -0500
+@@ -972,9 +972,7 @@ static void dispatch_packet(AvahiServer
+             return;
+         }
+ 
+-        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT) != 0 ||
+-            avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 ||
+-            avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) {
++        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0) {
+ 
+             avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
+             return;
diff --git a/avahi-0.6.31-reserve-space-for-record-data-when-size-estimate.patch b/avahi-0.6.31-reserve-space-for-record-data-when-size-estimate.patch
new file mode 100644
index 0000000..6935689
--- /dev/null
+++ b/avahi-0.6.31-reserve-space-for-record-data-when-size-estimate.patch
@@ -0,0 +1,118 @@
+From 5cf2d9e32dffc902ca5a6f0220904f8dca8ec055 Mon Sep 17 00:00:00 2001
+From: "Lee, Chun-Yi" <jlee@suse.com>
+Date: Fri, 7 Sep 2012 04:37:33 +0800
+Subject: [PATCH] avahi-core: reserve space for record data when size estimate
+
+When we tested put a lot of airprint service files(have 45 to 60 flies), found there have cpu loadinghigh problem when start avahi-daemon with those service files.
+
+After traced source code, there have problem in probe-sched.c::elapse_callback causes doesn't have any probe job set to DONE so the daemon unlimited send out DNS package.
+The root cause is when compare with the free package space in packet_add_probe_query before attach job key, the free package space doesn't include any record data that will attached after all keys attached. This defect causes whole DNS package is filled by job key, but doesn't remain enough space for any rdata. Then, that means have no job set to DONE.
+
+This patch add a new res_size member to AvahiDnsPacket, it used to sum the reserve size for record data the will attached after all keys attached. It can avoid keys consume whole size until p->size larger then p->max_size.
+
+Signed-off-by: Lee, Chun-Yi <jlee at suse.com>
+---
+ avahi-core/dns.c         |   20 ++++++++++++++++++++
+ avahi-core/dns.h         |    4 +++-
+ avahi-core/probe-sched.c |   10 ++++++++--
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+
+diff --git a/avahi-core/dns.c b/avahi-core/dns.c
+index 2fcd91f..523afdc 100644
+--- a/avahi-core/dns.c
++++ b/avahi-core/dns.c
+@@ -55,6 +55,7 @@ AvahiDnsPacket* avahi_dns_packet_new(unsigned mtu) {
+ 
+     p->size = p->rindex = AVAHI_DNS_PACKET_HEADER_SIZE;
+     p->max_size = max_size;
++    p->res_size = 0;
+     p->name_table = NULL;
+     p->data = NULL;
+ 
+@@ -833,6 +834,25 @@ size_t avahi_dns_packet_space(AvahiDnsPacket *p) {
+     return p->max_size - p->size;
+ }
+ 
++size_t avahi_dns_packet_reserve_size(AvahiDnsPacket *p, size_t res_size) {
++    assert(p);
++
++    assert(p->size + p->res_size <= p->max_size);
++
++    if ((p->size + p->res_size + res_size) <= p->max_size)
++   p->res_size += res_size;
++
++    return p->res_size;
++}
++
++size_t avahi_dns_packet_reserved_space(AvahiDnsPacket *p) {
++    assert(p);
++
++    assert(p->size + p->res_size <= p->max_size);
++
++    return p->max_size - p->size - p->res_size;
++}
++
+ int avahi_rdata_parse(AvahiRecord *record, const void* rdata, size_t size) {
+     int ret;
+     AvahiDnsPacket p;
+diff --git a/avahi-core/dns.h b/avahi-core/dns.h
+index 52e8d88..13b1ac2 100644
+--- a/avahi-core/dns.h
++++ b/avahi-core/dns.h
+@@ -30,7 +30,7 @@
+ #define AVAHI_DNS_PACKET_SIZE_MAX (AVAHI_DNS_PACKET_HEADER_SIZE + 256 + 2 + 2 + 4 + 2 + AVAHI_DNS_RDATA_MAX)
+ 
+ typedef struct AvahiDnsPacket {
+-    size_t size, rindex, max_size;
++    size_t size, rindex, max_size, res_size;
+     AvahiHashmap *name_table; /* for name compression */
+     uint8_t *data;
+ } AvahiDnsPacket;
+@@ -78,6 +78,8 @@ int avahi_dns_packet_skip(AvahiDnsPacket *p, size_t length);
+ 
+ int avahi_dns_packet_is_empty(AvahiDnsPacket *p);
+ size_t avahi_dns_packet_space(AvahiDnsPacket *p);
++size_t avahi_dns_packet_reserve_size(AvahiDnsPacket *p, size_t res_size);
++size_t avahi_dns_packet_reserved_space(AvahiDnsPacket *p);
+ 
+ #define AVAHI_DNS_FIELD_ID 0
+ #define AVAHI_DNS_FIELD_FLAGS 1
+diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c
+index 1e63411..63cb817 100644
+--- a/avahi-core/probe-sched.c
++++ b/avahi-core/probe-sched.c
+@@ -179,7 +179,7 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
+         avahi_record_get_estimate_size(pj->record);
+ 
+     /* Too large */
+-    if (size > avahi_dns_packet_space(p))
++    if (size > avahi_dns_packet_reserved_space(p))
+         return 0;
+ 
+     /* Create the probe query */
+@@ -189,6 +189,9 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
+     b = !!avahi_dns_packet_append_key(p, k, 0);
+     assert(b);
+ 
++    /* reserve size for record data */
++    avahi_dns_packet_reserve_size(p, avahi_record_get_estimate_size(pj->record));
++
+     /* Mark this job for addition to the packet */
+     pj->chosen = 1;
+ 
+@@ -202,9 +205,12 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
+             continue;
+ 
+         /* This job wouldn't fit in */
+-        if (avahi_record_get_estimate_size(pj->record) > avahi_dns_packet_space(p))
++        if (avahi_record_get_estimate_size(pj->record) > avahi_dns_packet_reserved_space(p))
+             break;
+ 
++   /* reserve size for record data */
++   avahi_dns_packet_reserve_size(p, avahi_record_get_estimate_size(pj->record));
++
+         /* Mark this job for addition to the packet */
+         pj->chosen = 1;
+     }
+-- 
+1.7.10.4
diff --git a/avahi-remove_lennart_prefix.patch b/avahi-remove_lennart_prefix.patch
new file mode 100644
index 0000000..cfb5704
--- /dev/null
+++ b/avahi-remove_lennart_prefix.patch
@@ -0,0 +1,174 @@
+From a69cafac1916223080d1ef8a5df1d0c59ab6f5e4 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Mon, 25 Aug 2014 12:38:29 +0200
+Subject: [PATCH] remove lennart prefix
+
+---
+ man/avahi-autoipd.8         |  2 +-
+ man/avahi-autoipd.action.8  |  2 +-
+ man/avahi-daemon.8          | 14 +++++++-------
+ man/avahi-daemon.conf.5     |  2 +-
+ man/avahi-dnsconfd.8        |  4 ++--
+ man/avahi-dnsconfd.action.8 |  2 +-
+ man/avahi.hosts.5           |  4 ++--
+ man/avahi.service.5         |  4 ++--
+ 8 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
+index 034804c..862d25f 100644
+--- a/man/avahi-autoipd.8
++++ b/man/avahi-autoipd.8
+@@ -68,7 +68,7 @@ Show help.
+ \fB-v | --version\f1
+ Show version information.
+ .SH FILES
+-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
++\fI/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
+ .SH SIGNALS
+ \fISIGINT, SIGTERM\f1: avahi-autoipd will shutdown. (Same as \fB--kill\f1)
+ 
+diff --git a/man/avahi-autoipd.action.8 b/man/avahi-autoipd.action.8
+index 837a762..62b14a4 100644
+--- a/man/avahi-autoipd.action.8
++++ b/man/avahi-autoipd.action.8
+@@ -2,7 +2,7 @@
+ .SH NAME
+ avahi-autoipd.action \- avahi-autoipd action script
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action
++\fB/etc/avahi/avahi-autoipd.action
+ \f1
+ .SH DESCRIPTION
+ \fIavahi-autoipd.action\f1 is the action script that is called whenever an IP address has been acquired by avahi-autoipd or when it detected an IP address conflict. The script should add or remove the specified address from the specified network interface.
+diff --git a/man/avahi-daemon.8 b/man/avahi-daemon.8
+index bbf2b43..1e5b9b2 100644
+--- a/man/avahi-daemon.8
++++ b/man/avahi-daemon.8
+@@ -13,11 +13,11 @@ avahi-daemon --check\fB
+ .SH DESCRIPTION
+ The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf architecture (also known as "Rendezvous" or "Bonjour"). The daemon registers local IP addresses and static services using mDNS/DNS-SD and provides two IPC APIs for local programs to make use of the mDNS record cache the avahi-daemon maintains. First there is the so called "simple protocol" which is used exclusively by avahi-dnsconfd (a daemon which configures unicast DNS servers using server info published via mDNS) and nss-mdns (a libc NSS plugin, providing name resolution via mDNS). Finally there is the D-Bus interface which provides a rich object oriented interface to D-Bus enabled applications.
+ 
+-Upon startup avahi-daemon interprets its configuration file \fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too.
++Upon startup avahi-daemon interprets its configuration file \fI/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too.
+ .SH OPTIONS
+ .TP
+ \fB-f | --file=\f1 \fIFILE\f1
+-Specify the configuration file to read. (default: /home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf)
++Specify the configuration file to read. (default: /etc/avahi/avahi-daemon.conf)
+ .TP
+ \fB-D | --daemonize\f1
+ Daemonize after startup. Implies \fB--syslog\f1.
+@@ -44,7 +44,7 @@ Don't change the process name while running. Unless this option is specified ava
+ Kill an already running avahi-daemon. (equivalent to sending a SIGTERM)
+ .TP
+ \fB-r | --reload\f1
+-Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) the files from \fI/home/lennart/tmp/avahi/etc/avahi/services/\f1. Please note that this will not reload the \fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP)
++Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) the files from \fI/etc/avahi/services/\f1. Please note that this will not reload the \fI/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP)
+ .TP
+ \fB-c | --check\f1
+ Return 0 as return code when avahi-daemon is already running.
+@@ -55,15 +55,15 @@ Show help
+ \fB-v | --version\f1
+ Show version information 
+ .SH FILES
+-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, \fBavahi-daemon.conf(5)\f1 for more information.
++\fI/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, \fBavahi-daemon.conf(5)\f1 for more information.
+ 
+-\fI/home/lennart/tmp/avahi/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information.
++\fI/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information.
+ 
+-\fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information.
++\fI/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information.
+ .SH SIGNALS
+ \fISIGINT, SIGTERM\f1: avahi-daemon will shutdown. (Same as \fB--kill\f1).
+ 
+-\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/home/lennart/tmp/avahi/etc/avahi/services/\f1. (Same as \fB--reload\f1)
++\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/etc/avahi/services/\f1. (Same as \fB--reload\f1)
+ 
+ \fISIGUSR1\f1: avahi-daemon will dump local and remote cached resource record data to syslog.
+ .SH AUTHORS
+diff --git a/man/avahi-daemon.conf.5 b/man/avahi-daemon.conf.5
+index 0ebc9d4..edddc1e 100644
+--- a/man/avahi-daemon.conf.5
++++ b/man/avahi-daemon.conf.5
+@@ -2,7 +2,7 @@
+ .SH NAME
+ avahi-daemon.conf \- avahi-daemon configuration file
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf
++\fB/etc/avahi/avahi-daemon.conf
+ \f1
+ .SH DESCRIPTION
+ \fIavahi-daemon.conf\f1 is the configuration file for avahi-daemon.
+diff --git a/man/avahi-dnsconfd.8 b/man/avahi-dnsconfd.8
+index 4ddee58..418ae36 100644
+--- a/man/avahi-dnsconfd.8
++++ b/man/avahi-dnsconfd.8
+@@ -11,7 +11,7 @@ avahi-dnsconfd --refresh\fB
+ avahi-dnsconfd --check\fB
+ \f1
+ .SH DESCRIPTION
+-avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/home/lennart/tmp/avahi/etc/avahi/dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS.
++avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/etc/avahi/dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS.
+ .SH OPTIONS
+ .TP
+ \fB-D | --daemonize\f1
+@@ -35,7 +35,7 @@ Show help
+ \fB-v | --version\f1
+ Show version information 
+ .SH FILES
+-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed.
++\fI/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed.
+ .SH SIGNALS
+ \fISIGINT, SIGTERM\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.
+ 
+diff --git a/man/avahi-dnsconfd.action.8 b/man/avahi-dnsconfd.action.8
+index 0ad2676..3f2f16a 100644
+--- a/man/avahi-dnsconfd.action.8
++++ b/man/avahi-dnsconfd.action.8
+@@ -2,7 +2,7 @@
+ .SH NAME
+ avahi-dnsconfd.action \- avahi-dnsconfd action script
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-dnsconfd.action
++\fB/etc/avahi/avahi-dnsconfd.action
+ \f1
+ .SH DESCRIPTION
+ \fIavahi-dnsconfd.action\f1 is the action script that is called whenever a new unicast DNS server is found or removed by avahi-dnsconfd. The default script as shipped with avahi patches \fI/etc/resolv.conf\f1 to reflect the changed unicast DNS server configuration.
+diff --git a/man/avahi.hosts.5 b/man/avahi.hosts.5
+index fe27077..dc4f73f 100644
+--- a/man/avahi.hosts.5
++++ b/man/avahi.hosts.5
+@@ -2,10 +2,10 @@
+ .SH NAME
+ avahi.hosts \- avahi-daemon static host name file
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/hosts
++\fB/etc/avahi/hosts
+ \f1
+ .SH DESCRIPTION
+-\fI/home/lennart/tmp/avahi/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information.
++\fI/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information.
+ 
+ The file format is similar to the one of \fI/etc/hosts\f1: on each line an IP address and the corresponding host name. The host names should be in FQDN form, i.e. with appended .local suffix.
+ .SH AUTHORS
+diff --git a/man/avahi.service.5 b/man/avahi.service.5
+index 2ef8333..1775add 100644
+--- a/man/avahi.service.5
++++ b/man/avahi.service.5
+@@ -2,10 +2,10 @@
+ .SH NAME
+ avahi.service \- avahi-daemon static service file
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/services/*.service
++\fB/etc/avahi/services/*.service
+ \f1
+ .SH DESCRIPTION
+-\fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp)
++\fI/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp)
+ .SH XML TAGS
+ .TP
+ \fB<service-group>\f1 The document tag of avahi service files. Should contain one \fB<name>\f1 and one or more \fB<service>\f1 elements.
+-- 
+1.9.3
+
diff --git a/avahi.spec b/avahi.spec
index 3578a9d..ebb81ce 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -3,7 +3,7 @@
 %{?!WITH_COMPAT_HOWL:   %global WITH_COMPAT_HOWL  1}
 %{?!WITH_QT3:           %global WITH_QT3 1}
 
-%ifarch sparc64 s390 aarch64 ppc64le
+%ifarch sparc64 s390 aarch64
 %define WITH_MONO 0
 %endif
 %if 0%{?rhel}
@@ -18,7 +18,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          30%{?dist}
+Release:          40%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -50,13 +50,14 @@ BuildRequires:    libdaemon-devel >= 0.11
 BuildRequires:    glib2-devel
 BuildRequires:    libcap-devel
 BuildRequires:    expat-devel
-BuildRequires:    python
+BuildRequires:    python2-devel
+BuildRequires:    python3-devel
 BuildRequires:    gdbm-devel
 BuildRequires:    pygtk2
 BuildRequires:    intltool
 BuildRequires:    perl-XML-Parser
 %if %{WITH_MONO}
-BuildRequires:    mono-devel >= 1.1.13
+BuildRequires:    mono-devel
 BuildRequires:    monodoc-devel
 %endif
 BuildRequires:    systemd
@@ -67,13 +68,34 @@ Requires(postun): systemd
 Requires(post):   systemd-sysv
 
 Source0:          http://avahi.org/download/%{name}-%{version}.tar.gz
-Patch0:           avahi-0.6.30-mono-libdir.patch
+
+## upstream patches
+Patch1:           0001-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch
+Patch2:           0002-avahi-daemon-don-t-leak-host-info-by-default.patch
+Patch3:           0003-core-don-t-leak-hinfo-workstation-even-if-the-config.patch
+Patch4:           0004-build-sys-fix-MKDIR_P-for-recent-automake.patch
+Patch5:           0005-build-sys-fix-parallel-install-in-avahi-utils.patch
+Patch6:           0006-build-sys-fix-previous-commit-for-recent-automake.patch
+# munged a bit to make it apply against tarball
+Patch7:           0007-avahi-common-typo-fix.patch
+Patch8:           0008-avahi-daemon-add-option-host-name-from-machine-id.patch
+
+Patch100:         avahi-0.6.30-mono-libdir.patch
 
 # Disable -Werror and remove G*_DISABLE_DEPRECATED definitions
-Patch1:           avahi-0.6.31-no-deprecations.patch
+Patch101:         avahi-0.6.31-no-deprecations.patch
+
+Patch103:         0001-netlink-check-that-the-origin-of-the-rtnetlink-messa.patch
+
+Patch104:         0001-Python3-support.patch
+
+Patch105:         avahi-0.6.31-reserve-space-for-record-data-when-size-estimate.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1105647
-Patch2:           0001-Disable-publish-workstation-and-publish-hinfo-by-def.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1240711
+# proposed fix from http://avahi.org/ticket/352
+Patch106:         avahi-0.6.31-invalid_packet.patch
+
+Patch107:         avahi-remove_lennart_prefix.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -98,12 +120,12 @@ Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:         %{name}-glib%{?_isa} = %{version}-%{release}
 Requires:         %{name}-ui-gtk3%{?_isa} = %{version}-%{release}
+Requires:         python-avahi = %{version}-%{release}
 Requires:         vnc
 Requires:         openssh-clients
 Requires:         pygtk2
 Requires:         pygtk2-libglade
 Requires:         gdbm
-Requires:         python
 Requires:         dbus-python
 
 %description ui-tools
@@ -320,14 +342,47 @@ avahi-dnsconfd connects to a running avahi-daemon and runs the script
 local LAN. This is useful for configuring unicast DNS servers in a DHCP-like
 fashion with mDNS.
 
+%package -n python-avahi
+Summary:          Python2 Avahi bindings
+Provides:         python2-avahi = %{version}-%{release}
+Requires:         %{name} = %{version}-%{release}
+Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description -n python-avahi
+%{summary}.
+
+%package -n python3-avahi
+Summary:          Python3 Avahi bindings
+Requires:         %{name} = %{version}-%{release}
+Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description -n python3-avahi
+%{summary}.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .mono-libdir
-%patch1 -p1 -b .no_deprecations
-%patch2 -p1 -b .disable-workstation-hinfo
+
+%patch1 -p1 -b .0001
+%patch2 -p1 -b .0002
+%patch3 -p1 -b .0003
+%patch4 -p1 -b .0004
+%patch5 -p1 -b .0005
+%patch6 -p1 -b .0006
+%patch7 -p1 -b .0007
+%patch8 -p1 -b .0008
+
+%patch100 -p1 -b .mono-libdir
+%patch101 -p1 -b .no_deprecations
+%patch103 -p1 -b .netlink-userns
+%patch104 -p1 -b .python3
+%patch105 -p1 -b .reserve-size
+%patch106 -p1 -b .invalid_packet
+%patch107 -p1 -b .remove_lennart_prefix
 rm docs/INSTALL
 
-# patch1 requires autogen
+# patch101 requires autogen
+rm -v missing
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -384,9 +439,39 @@ ln -s avahi-compat-libdns_sd.pc %{buildroot}/%{_libdir}/pkgconfig/libdns_sd.pc
 ln -s avahi-compat-libdns_sd/dns_sd.h %{buildroot}/%{_includedir}/
 %endif
 
+# Add python3 support
+mkdir -p %{buildroot}%{python3_sitelib}/avahi/
+cp -r %{buildroot}%{python2_sitelib}/avahi/* %{buildroot}%{python3_sitelib}/avahi/
+rm -fv %{buildroot}%{buildroot}%{python3_sitelib}/avahi/*.py{c,o}
+
 rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-daemon
 rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-dnsconfd
 
+# Merge applications into one software center item
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/bssh.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+<component type="desktop">
+  <metadata_license>CC0-1.0</metadata_license>
+  <id>bssh.desktop</id>
+  <metadata>
+    <value key="X-Merge-With-Parent">avahi-discover.desktop</value>
+  </metadata>
+</component>
+EOF
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/bvnc.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+<component type="desktop">
+  <metadata_license>CC0-1.0</metadata_license>
+  <id>bvnc.desktop</id>
+  <metadata>
+    <value key="X-Merge-With-Parent">avahi-discover.desktop</value>
+  </metadata>
+</component>
+EOF
+
 %find_lang %{name}
 
 %pre
@@ -501,6 +586,7 @@ exit 0
 %files autoipd
 %{_sbindir}/avahi-autoipd
 %config(noreplace) %{_sysconfdir}/avahi/avahi-autoipd.action
+%attr(1770,avahi-autoipd,avahi-autoipd) %dir %{_localstatedir}/lib/avahi-autoipd/
 %{_mandir}/man8/avahi-autoipd.*
 
 %files dnsconfd
@@ -528,10 +614,10 @@ exit 0
 %{_mandir}/man1/avahi-discover*
 %{_mandir}/man1/avahi-bookmarks*
 %{_datadir}/applications/b*.desktop
+%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/avahi-discover.desktop
-# These are .py files only, so they don't go in lib64
-%{_prefix}/lib/python?.?/site-packages/*
 %{_datadir}/avahi/interfaces/
+%{python2_sitelib}/avahi_discover/
 
 %files devel
 %{_libdir}/libavahi-common.so
@@ -636,7 +722,48 @@ exit 0
 %{_libdir}/pkgconfig/libdns_sd.pc
 %endif
 
+%files -n python-avahi
+# These are .py files only, so they don't go in lib64
+%{python2_sitelib}/avahi/
+
+%files -n python3-avahi
+# These are .py files only, so they don't go in lib64
+%{python3_sitelib}/avahi/
+
 %changelog
+* Thu Sep 17 2015 Rex Dieter <rdieter@fedoraproject.org> 0.6.31-40
+- non-existing homedir /var/lib/avahi-autoipd (#1173822)
+
+* Thu Sep 17 2015 Rex Dieter <rdieter@fedoraproject.org> 0.6.31-39
+- Syslog Filled With "Invalid response packet from host" Message (#1240711)
+- avahi-daemon manpage references file locations under /home/lennart/tmp (#991094)
+- fix python-avahi dep botched in build -38
+
+* Thu Sep 17 2015 Rex Dieter <rdieter@fedoraproject.org> 0.6.31-38
+- pull in post 0.6.31 upstream fixes (#1246849), python related packaging polish
+
+* Tue Jul 14 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.6.31-37
+- Add old patch from SuSE to fix 100%% CPU bug (RHBZ 952193).
+- Don't install py2.7 .py{o,c} files in py3.4 package.
+
+* Sun Jun 21 2015 Bastien Nocera <bnocera@redhat.com> 0.6.31-36
+- Split off Python bindings, add Python3 support
+
+* Wed Jun 17 2015 Michal Sekletar <msekleta@redhat.com> - 0.6.31-35
+- check that rtnetlink messages has pid == 0, i.e. they sender is kernel (#1227052)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.31-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 18 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.6.31-33
+- Rebuild (mono4)
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.6.31-32
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 0.6.31-31
+- Add an AppData file for the software center
+
 * Thu Nov 27 2014 Peter Lemenkov <lemenkov@gmail.com> - 0.6.31-30
 - Drop post-stage dependency on initscripts (rhbz #1168566). See also rhbz #182462.