diff --git a/avahi.spec b/avahi.spec
index 2295920..422fd58 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -681,7 +681,20 @@ export PKG_CONFIG_PATH=/usr/lib/qt4/%{_lib}/pkgconfig
 
 mkdir -p %{buildroot}%{_localstatedir}/avahi
 
+# https://bugzilla.rosalinux.ru/show_bug.cgi?id=9855
+# https://wiki.archlinux.org/index.php/Avahi#Troubleshooting
+sed -i -e 's,^publish-workstation=no,publish-workstation=yes,g' \
+	-e 's,^use-ipv6=yes,use-ipv6=no,g' \
+	%{buildroot}/%{_sysconfdir}/%{name}/avahi-daemon.conf
+# validate
+grep -q '^publish-workstation=yes' \
+	%{buildroot}/%{_sysconfdir}/%{name}/avahi-daemon.conf || exit 1
+grep -q '^use-ipv6=no' \
+	%{buildroot}/%{_sysconfdir}/%{name}/avahi-daemon.conf || exit 1
+
+# We have a seperate Avahi service in openssh package
 rm -f %{buildroot}/%{_sysconfdir}/%{name}/services/ssh.service
+rm -f %{buildroot}/%{_sysconfdir}/%{name}/services/sftp-ssh.service
 ln -s avahi-compat-howl.pc %{buildroot}%{_libdir}/pkgconfig/howl.pc
 %if "%{_lib}" != "lib" && %{with mono}
 mkdir -p %{buildroot}%{_prefix}/lib