diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp
index 05abf61..6b061a0 100644
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@@ -18,24 +18,55 @@ class ldap::auth inherits ldap::client {
 
     case $operatingsystem {
         CentOS: {
-            package { "nss_ldap":
-                ensure => installed,
-            }
-            exec { "authconfig --enableldap --enableldapauth --enableldapssl --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --update":
-                path    => "/bin:/usr/bin:/sbin:/usr/sbin",
-                unless  => 'cat /etc/sysconfig/authconfig | egrep "^USELDAPAUTH=yes$|^USELDAP=yes$" | wc -l | egrep "^2$"',
-                before  => [ Augeas["pam-ldap-conf"],
-                             File["/etc/openldap/ldap.conf"], ],
-                require => Package["nss_ldap"],
-            }
-            augeas { "pam-ldap-conf":
-                context  => "/files/etc/ldap.conf",
-                changes  => [ "set nss_paged_results yes",
-                              "set pam_password exop",
-                              "set ssl on", ],
-                onlyif   => [ "get nss_paged_results != yes",
-                              "get pam_password != exop",
-                              "get ssl != on", ],
+            case $operatingsystemrelease {
+                /^6/: {
+                    package { "nss-pam-ldapd":
+                        ensure => installed,
+                    }
+                    exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --update":
+                        path    => "/bin:/usr/bin:/sbin:/usr/sbin",
+                        unless  => 'cat /etc/sysconfig/authconfig | egrep "^USELDAPAUTH=yes$|^USELDAP=yes$" | wc -l | egrep "^2$"',
+                        before  => [ Augeas["pam-ldap-conf"],
+                                     File["/etc/openldap/ldap.conf"], ],
+                        require => Package["nss-pam-ldapd"],
+                    }
+                    augeas { "pam-ldap-conf":
+                        changes => [ "set pagesize 500",
+                                     "set ssl on",
+                                     "set tls_reqcert never", ],
+                        onlyif  => [ "get pagesize != 500",
+                                     "get ssl != on",
+                                     "get tls_reqcert != never", ],
+                        incl    => "/etc/nslcd.conf",
+                        lens    => "Spacevars.simple_lns",
+                        notify  => Service["nslcd"],
+                    }
+                    service { "nslcd":
+                         ensure => running,
+                         enable => true,
+                    }
+                }
+                default: {
+                    package { "nss_ldap":
+                        ensure => installed,
+                    }
+                    exec { "authconfig --enableldap --enableldapauth --enableldapssl --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --update":
+                        path    => "/bin:/usr/bin:/sbin:/usr/sbin",
+                        unless  => 'cat /etc/sysconfig/authconfig | egrep "^USELDAPAUTH=yes$|^USELDAP=yes$" | wc -l | egrep "^2$"',
+                        before  => [ Augeas["pam-ldap-conf"],
+                                     File["/etc/openldap/ldap.conf"], ],
+                        require => Package["nss_ldap"],
+                    }
+                    augeas { "pam-ldap-conf":
+                        context  => "/files/etc/ldap.conf",
+                        changes  => [ "set nss_paged_results yes",
+                                      "set pam_password exop",
+                                      "set ssl on", ],
+                        onlyif   => [ "get nss_paged_results != yes",
+                                      "get pam_password != exop",
+                                      "get ssl != on", ],
+                    }
+                }
             }
         }
 	Ubuntu: {