diff --git a/manifests/client.pp b/manifests/client.pp
index 609c537..2d4714c 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -177,6 +177,7 @@
   $bindpw         = false,
   $ssl            = false,
   $ssl_cert       = false,
+  $search_scope   = false,
 
   $nsswitch   = false,
   $nss_passwd = false,
@@ -230,7 +231,7 @@
   }
 
   # Configurations based on operating system release
-  include "ldap::os::${::operatingsystem}"
+  include "ldap::os::${::osfamily}"
 
   if($ssl) {
 
diff --git a/templates/etc/openldap/ldap.conf.erb b/templates/etc/openldap/ldap.conf.erb
index 62021be..1b4cdae 100644
--- a/templates/etc/openldap/ldap.conf.erb
+++ b/templates/etc/openldap/ldap.conf.erb
@@ -39,6 +39,10 @@ pam_password         <%= @pam_passwd %>
 pam_filter           <%= @pam_filter %>
 <% end -%>
 
+<% if @search_scope != false then -%>
+scope <%= @search_scope %>
+<% end -%>
+
 <% if @sudoers_base != false -%>
 sudoers_base          <%= @sudoers_base %>,<%= @base %>
 sudoers_search_filter <%= @sudoers_filter %>