diff --git a/SOURCES/0001-man-correct-short-option-to-print-version-string.patch b/SOURCES/0001-man-correct-short-option-to-print-version-string.patch
new file mode 100644
index 0000000..3de04f4
--- /dev/null
+++ b/SOURCES/0001-man-correct-short-option-to-print-version-string.patch
@@ -0,0 +1,40 @@
+From 7e7d6d6724742cc936177bf8dd6737b8b6f9d160 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 21 Apr 2015 13:48:45 +0200
+Subject: [PATCH 1/2] man: correct short option to print version string
+
+Related: #948583
+---
+ man/avahi-autoipd.8 | 2 +-
+ man/avahi-daemon.8  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
+index 034804c..e44c953 100644
+--- a/man/avahi-autoipd.8
++++ b/man/avahi-autoipd.8
+@@ -65,7 +65,7 @@ Don't change the process name while running. Unless this option is specified ava
+ \fB-h | --help\f1
+ Show help.
+ .TP
+-\fB-v | --version\f1
++\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.
+diff --git a/man/avahi-daemon.8 b/man/avahi-daemon.8
+index bbf2b43..3b35799 100644
+--- a/man/avahi-daemon.8
++++ b/man/avahi-daemon.8
+@@ -52,7 +52,7 @@ Return 0 as return code when avahi-daemon is already running.
+ \fB-h | --help\f1
+ Show help
+ .TP
+-\fB-v | --version\f1
++\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.
+-- 
+2.3.4
+
diff --git a/SOURCES/0002-man-add-description-for-t-option.patch b/SOURCES/0002-man-add-description-for-t-option.patch
new file mode 100644
index 0000000..675079c
--- /dev/null
+++ b/SOURCES/0002-man-add-description-for-t-option.patch
@@ -0,0 +1,27 @@
+From 0eddf3f8a2e7321ed4ab33680c0559740021eb1e Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 21 Apr 2015 13:50:41 +0200
+Subject: [PATCH 2/2] man: add description for -t option
+
+Related: #948583
+---
+ man/avahi-autoipd.8 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
+index e44c953..0c2b814 100644
+--- a/man/avahi-autoipd.8
++++ b/man/avahi-autoipd.8
+@@ -59,6 +59,9 @@ Wait until a IP address has been successfully acquired before detaching. Only va
+ \fB--force-bind\f1
+ Acquire an IPv4LL address, even if a routable address has been configured on the interface.
+ .TP
++\fB-t | --script\f1
++Action script to run (defaults to /home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action). See \fBautoipd.action(8)\f1 for more details. 
++.TP
+ \fB--no-proc-title\f1
+ Don't change the process name while running. Unless this option is specified avahi-autoipd will reflect its current state and the IP address in the process title.
+ .TP
+-- 
+2.3.4
+
diff --git a/SOURCES/0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch b/SOURCES/0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch
new file mode 100644
index 0000000..ca14613
--- /dev/null
+++ b/SOURCES/0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch
@@ -0,0 +1,42 @@
+From c17ad43fc445ee649f1020378d8464b96ce57102 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Mon, 13 Apr 2015 10:06:41 +0200
+Subject: [PATCH 3/4] dbus: don't crash if we can't determine alternative
+ {service,host} name
+
+Resolves: #1003688
+---
+ avahi-daemon/dbus-protocol.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
+index eb8a662..d7738bd 100644
+--- a/avahi-daemon/dbus-protocol.c
++++ b/avahi-daemon/dbus-protocol.c
+@@ -391,6 +391,11 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH
+         }
+ 
+         t = avahi_alternative_host_name(n);
++        if (!t) {
++            avahi_log_warn("Failed to determine alternative host name");
++            goto fail;
++        }
++
+         avahi_dbus_respond_string(c, m, t);
+         avahi_free(t);
+ 
+@@ -405,6 +410,11 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH
+         }
+ 
+         t = avahi_alternative_service_name(n);
++        if (!t) {
++            avahi_log_warn("Failed to determine alternative service name");
++            goto fail;
++        }
++
+         avahi_dbus_respond_string(c, m, t);
+         avahi_free(t);
+ 
+-- 
+2.3.4
+
diff --git a/SOURCES/0004-avahi-core-reserve-space-for-record-data-when-size-e.patch b/SOURCES/0004-avahi-core-reserve-space-for-record-data-when-size-e.patch
new file mode 100644
index 0000000..0247518
--- /dev/null
+++ b/SOURCES/0004-avahi-core-reserve-space-for-record-data-when-size-e.patch
@@ -0,0 +1,131 @@
+From 86e213fbd0d24b5b2e58d474d27d47b222011936 Mon Sep 17 00:00:00 2001
+From: "Lee, Chun-Yi" <jlee at suse.com>
+Date: Mon, 10 Sep 2012 10:27:56 +0800
+Subject: [PATCH 4/4] 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.
+
+Resolves: #1081801
+---
+ 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;
+     }
+-- 
+2.3.4
+
diff --git a/SOURCES/0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch b/SOURCES/0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch
new file mode 100644
index 0000000..f6ac97b
--- /dev/null
+++ b/SOURCES/0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch
@@ -0,0 +1,185 @@
+From bc5677a679ae4ade6c1d033c3bdc54dda0f15cc0 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 21 Apr 2015 14:27:34 +0200
+Subject: [PATCH 5/5] Remove prefix /home/lennart/tmp/avahi from references in
+ manpages
+
+Resolves: #1120233
+---
+ man/avahi-autoipd.8         |  4 ++--
+ 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, 18 insertions(+), 18 deletions(-)
+
+diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
+index 0c2b814..aca4a21 100644
+--- a/man/avahi-autoipd.8
++++ b/man/avahi-autoipd.8
+@@ -60,7 +60,7 @@ Wait until a IP address has been successfully acquired before detaching. Only va
+ Acquire an IPv4LL address, even if a routable address has been configured on the interface.
+ .TP
+ \fB-t | --script\f1
+-Action script to run (defaults to /home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action). See \fBautoipd.action(8)\f1 for more details. 
++Action script to run (defaults to /etc/avahi/avahi-autoipd.action). See \fBautoipd.action(8)\f1 for more details.
+ .TP
+ \fB--no-proc-title\f1
+ Don't change the process name while running. Unless this option is specified avahi-autoipd will reflect its current state and the IP address in the process title.
+@@ -71,7 +71,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 3b35799..4141271 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.
+-- 
+2.3.4
+
diff --git a/SPECS/avahi.spec b/SPECS/avahi.spec
index e491555..d381405 100644
--- a/SPECS/avahi.spec
+++ b/SPECS/avahi.spec
@@ -1,3 +1,5 @@
+%global _hardened_build 1
+
 %{?!WITH_MONO:          %global WITH_MONO 1}
 %{?!WITH_COMPAT_DNSSD:  %global WITH_COMPAT_DNSSD 1}
 %{?!WITH_COMPAT_HOWL:   %global WITH_COMPAT_HOWL  1}
@@ -10,7 +12,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          14%{?dist}
+Release:          15%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -58,6 +60,11 @@ Requires(post):   systemd-sysv
 
 Source0:          http://avahi.org/download/%{name}-%{version}.tar.gz
 Patch0:           avahi-0.6.30-mono-libdir.patch
+Patch1:           0001-man-correct-short-option-to-print-version-string.patch
+Patch2:           0002-man-add-description-for-t-option.patch
+Patch3:           0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch
+Patch4:           0004-avahi-core-reserve-space-for-record-data-when-size-e.patch
+Patch5:           0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -334,8 +341,7 @@ local LAN. This is useful for configuring unicast DNS servers in a DHCP-like
 fashion with mDNS.
 
 %prep
-%setup -q
-%patch0 -p1 -b .mono-libdir
+%autosetup -S git
 
 %build
 %configure \
@@ -643,6 +649,13 @@ fi
 %endif
 
 %changelog
+* Tue Apr 21 2015 Michal Sekletar <msekleta@redhat.com> - 0.6.31-15
+- enable hardened build (#1092506)
+- fix short option for --version, document -t option of avahi-autoipd (#948583)
+- fix crashes in D-Bus methods GetAlternativeHostName and GetAlternativeServiceName (#1003688)
+- fix bug when avahi-daemon ended up in a tight loop (#1081801)
+- remove prefix /home/lennart/tmp/avahi from references in man pages (#1120233)
+
 * Mon Dec  8 2014 Michal Sekletar <msekleta@redhat.com> - 0.6.31-14
 - remove dependency on the main package from avahi-libs (#1170681)