diff --git a/tftp/manifests/init.pp b/tftp/manifests/init.pp
index 8176051..b3cc313 100644
--- a/tftp/manifests/init.pp
+++ b/tftp/manifests/init.pp
@@ -98,6 +98,23 @@ class tftp::server {
                                Package["tftp-server"], ],
             }
         }
+        "fedora": {
+            if versioncmp($::operatingsystemrelease, '21') < 0 {
+                include inetd::server
+                inetd::service { "tftp":
+                    ensure  => present,
+                    require => [ File["/var/lib/tftpboot"],
+                                 Package["tftp-server"], ],
+                }  
+            } else {
+                service { "tftp":
+                    ensure => running,
+                    enable => true,
+                    require => [ File["/var/lib/tftpboot"],
+                                 Package["tftp-server"], ],
+                }
+            }
+        }
         "openbsd": {
             if versioncmp($::operatingsystemrelease, '5.2') < 0 {
                 include inetd::server