diff --git a/src/freedombone b/src/freedombone
index 57cd5754..506f6c3e 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -8182,10 +8182,12 @@ function tox_avahi {
   echo "$MY_USERNAME)" >> /usr/bin/publish-to-avahi
   echo '' >> /usr/bin/publish-to-avahi
 
-  echo "echo \"<?xml version=\"1.0\" standalone=\"no\"?><!--*-nxml-*-->\" > /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
+  echo "echo \"<?xml version='1.0' standalone='no'?><!--*-nxml-*-->\" > /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
   echo "echo '<!DOCTYPE service-group SYSTEM \"avahi-service.dtd\">' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
   echo "echo '<service-group>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
-  echo 'echo "  <name replace-wildcards=\"yes\">%h $TOX_ID</name>" >> /etc/avahi/services/tox.service' >> /usr/bin/publish-to-avahi
+  echo -n 'echo "  <name replace-wildcards=' >> /usr/bin/publish-to-avahi
+  echo -n "'yes'" >> /usr/bin/publish-to-avahi
+  echo '>%h $TOX_ID</name>" >> /etc/avahi/services/tox.service' >> /usr/bin/publish-to-avahi
   echo "echo '  <service>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
   echo "echo '    <type>_tox._tcp</type>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
   echo "echo \"    <port>$TOX_PORT</port>\" >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi