diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp
index 167b33e..05abf61 100644
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@@ -235,14 +235,30 @@ class ldap::client::ruby {
 class ldap::server {
 
     case $operatingsystem {
-	"debian","ubuntu": {
-		$user = "openldap"
-		$group = "openldap"
-	}
-	"centos","fedora": {
-		$user = "ldap"
-		$group = "ldap"
-	}
+        "debian","ubuntu": {
+            $user = "openldap"
+            $group = "openldap"
+            $package_name = "slapd"
+            $service_name = "slapd"
+        }
+        "fedora": {
+            $user = "ldap"
+            $group = "ldap"
+            $package_name = "openldap-servers"
+            $service_name = "slapd"
+        }
+        "centos": {
+            $user = "ldap"
+            $group = "ldap"
+            $package_name = $operatingsystemrelease ? {
+                /^5/ => [ "openldap-servers", "openldap-servers-overlays" ],
+                /^6/ => "openldap-servers",
+            }
+            $service_name = $operatingsystemrelease ? {
+                /^5/ => "ldap",
+                /^6/ => "slapd",
+            }
+        }
     }
 
     if $ldap_datadir {
@@ -267,26 +283,14 @@ class ldap::server {
             require => Package["openldap-server"],
         }
     }
-  
+
     package { "openldap-server":
-	name => $operatingsystem ? {
-		"ubuntu" => "slapd",
-		"debian" => "slapd",
-		"centos" => [ "openldap-servers",
-			      "openldap-servers-overlays" ],
-		"fedora" => [ "openldap-servers",
-			      "openldap-servers-overlays" ],
-	},
+        name   => $package_name,
         ensure => installed,
     }
 
     service { "slapd":
-	name => $operatingsystem ? {
-		"ubuntu" => "slapd",
-		"debian" => "slapd",
-		"centos" => "ldap",
-		"fedora" => "ldap",
-	},
+        name    => $service_name,
         ensure  => running,
         enable  => true,
         require => Package ["openldap-server"]