diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp
index 81a60a5..35f2c17 100644
--- a/yum/manifests/init.pp
+++ b/yum/manifests/init.pp
@@ -367,10 +367,24 @@ class yum::repo::skype {
 # Add Puppetlabs repository
 #
 class yum::repo::puppetlabs {
+
+    case $::operatingsystem {
+        "fedora": {
+            $dir = "fedora/f\$releasever/products/\$basearch"
+        }
+        "centos": {
+            $dir = "el/\$releasever/products/\$basearch"
+        }
+        default: {
+            fail("yum::repo::puppetlabs not supported in ${::operatingsystem}")
+        }
+    }
+
     yum::repo { "puppetlabs":
         descr   => "Puppet Labs Packages",
-        baseurl => "http://yum.puppetlabs.com/el/\$releasever/products/\$basearch",
+        baseurl => "http://yum.puppetlabs.com/${dir}",
         gpgkey  => "http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs",
     }
+
 }
-                
+