diff --git a/tftp/manifests/init.pp b/tftp/manifests/init.pp
index 7e5c23a..2d8db3f 100644
--- a/tftp/manifests/init.pp
+++ b/tftp/manifests/init.pp
@@ -8,8 +8,6 @@
 #
 class tftp::server {
 
-    include inetd::server
-
     if $tftp_datadir {
         file { "${tftp_datadir}":
             ensure  => directory,
@@ -34,19 +32,22 @@ class tftp::server {
         }
     }
 
-    if $operatingsystem == "Fedora" {
-        file { "/var/lib/tftpboot":
-            ensure  => link,
-            target  => "/srv/tftpboot",
-            force   => true,
-            require => File["/srv/tftpboot"],
+    case $operatingsystem {
+        debian,fedora,ubuntu: {
+            file { "/var/lib/tftpboot":
+                ensure  => link,
+                target  => "/srv/tftpboot",
+                force   => true,
+                require => File["/srv/tftpboot"],
+            }
         }
-    } else {
-        file { "/tftpboot":
-            ensure  => link,
-            target  => "/srv/tftpboot",
-            force   => true,
-            require => File["/srv/tftpboot"],
+        default: {
+            file { "/tftpboot":
+                ensure  => link,
+                target  => "/srv/tftpboot",
+                force   => true,
+                require => File["/srv/tftpboot"],
+            }
         }
     }
 
@@ -74,16 +75,13 @@ class tftp::server {
 
     case $operatingsystem {
         debian,ubuntu: {
-            file { "/etc/xinetd.d/tftp":
-                ensure => present,
-                source => "puppet:///tftp/tftp.xinetd",
-                mode   => 0644,
-                owner  => root,
-                group  => root,
-                notify => Service["xinetd"],
+            service { "tftpd-hpa":
+                ensure => running,
+                enable => true,
             }
         }
         default: {
+            include inetd::server
             inetd::service { "tftp":
                 ensure  => present,
                 require => Package["tftp-server"],