diff --git a/0001-Disable-publish-workstation-and-publish-hinfo-by-def.patch b/0001-Disable-publish-workstation-and-publish-hinfo-by-def.patch
new file mode 100644
index 0000000..4d8934e
--- /dev/null
+++ b/0001-Disable-publish-workstation-and-publish-hinfo-by-def.patch
@@ -0,0 +1,33 @@
+From 850df1a121b8415c8235cbd2395ad94098ef4ce8 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 6 Jun 2014 17:43:45 +0200
+Subject: [PATCH] Disable publish-workstation= and publish-hinfo= by default
+
+"Publish workstation" and "Publish hinfo" export some metadata about the
+machine which aren't necessary for normal operations. If used to monitor
+availability of remote machines, such as in a computer lab, system
+administrators could enable them remotely.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1105647
+---
+ 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 c992842..ce7914e 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/avahi.spec b/avahi.spec
index 6458991..837e317 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -18,7 +18,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          27%{?dist}
+Release:          28%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -71,6 +71,9 @@ Patch0:           avahi-0.6.30-mono-libdir.patch
 # Disable -Werror and remove G*_DISABLE_DEPRECATED definitions
 Patch1:           avahi-0.6.31-no-deprecations.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1105647
+Patch2:           0001-Disable-publish-workstation-and-publish-hinfo-by-def.patch
+
 %description
 Avahi is a system which facilitates service discovery on
 a local network -- this means that you can plug your laptop or
@@ -320,6 +323,7 @@ fashion with mDNS.
 %setup -q
 %patch0 -p1 -b .mono-libdir
 %patch1 -p1 -b .no_deprecations
+%patch2 -p1 -b .disable-workstation-hinfo
 rm docs/INSTALL
 
 # patch1 requires autogen
@@ -632,6 +636,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Jun 26 2014 Bastien Nocera <bnocera@redhat.com> 0.6.31-28
+- Disable publish-workstation= and publish-hinfo= by default (#1105647)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.31-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild