diff --git a/avahi/manifests/init.pp b/avahi/manifests/init.pp
index 82d903b..6268aff 100644
--- a/avahi/manifests/init.pp
+++ b/avahi/manifests/init.pp
@@ -27,6 +27,21 @@ class avahi::daemon {
         require => Package["avahi"],
     }
 
+    file { "/etc/avahi/services":
+        ensure  => present,
+        purge   => true,
+        force   => true,
+        recurse => true,
+        source  => "puppet:///custom/empty",
+        mode    => 0755,
+        owner   => root,
+        group   => $operatingsystem ? {
+            openbsd => wheel,
+            default => root,
+        },
+        require => Package["avahi"],
+    }
+    
 }
 
 
@@ -76,3 +91,11 @@ define avahi::service($port = "AUTO", $description = "%h", $ensure = "present",
     }
 
 }
+
+# Install avahi client support.
+#
+class avahi::client inherits avahi::daemon {
+    package { "avahi-tools":
+        ensure => installed,
+    }
+}