diff --git a/manifests/pamd.pp b/manifests/pamd.pp
index 258d78a..eb1e077 100644
--- a/manifests/pamd.pp
+++ b/manifests/pamd.pp
@@ -275,8 +275,7 @@
   }
 
   case $::operatingsystem {
-
-    /(?i:Debian)/: {
+    /(?i:Debian|Ubuntu)/: { 
       include pam::pamd::debian
     }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 76e98a9..a9ccc24 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,8 +3,7 @@
 class pam::params {
 
   case $::operatingsystem {
-
-    /(?i:Debian)/: {
+    /(?i:Debian|Ubuntu)/: {
       $packages    = [ 'libpam-ldap' ]
       $prefix_pamd = '/etc/pam.d'
       $owner       = 'root'
diff --git a/templates/pam.d/common-session-noninteractive.erb b/templates/pam.d/common-session-noninteractive.erb
index 6b5e2be..a162856 100644
--- a/templates/pam.d/common-session-noninteractive.erb
+++ b/templates/pam.d/common-session-noninteractive.erb
@@ -4,7 +4,7 @@
 ###############################################################################
 
 <% if scope.lookupvar('pam::pamd::pam_mkhomedir') == true then -%>
-session	<%= scope.lookupvar('pam::pamd::pam_mkhomedir_session_set') %>
+session	<%= scope.lookupvar('pam::params::pam_mkhomedir_session') %>
 <% end -%>
 
 session	[default=1]	pam_permit.so
@@ -12,5 +12,5 @@ session	requisite	pam_deny.so
 session	required	pam_permit.so
 session	required	pam_unix.so 
 <% if scope.lookupvar('pam::pamd::pam_ldap') == true then -%>
-session	<%= scope.lookupvar('pam::pamd::pam_ldap_session_set') %>
+session	<%= scope.lookupvar('pam::params::pam_ldap_session') %>
 <% end -%>
diff --git a/templates/pam.d/common-session.erb b/templates/pam.d/common-session.erb
index 0ae1ad4..745eada 100644
--- a/templates/pam.d/common-session.erb
+++ b/templates/pam.d/common-session.erb
@@ -4,7 +4,7 @@
 ###############################################################################
 
 <% if scope.lookupvar('pam::pamd::pam_mkhomedir') == true then -%>
-session	<%= scope.lookupvar('pam::pamd::pam_mkhomedir_session_set') %>
+session	<%= scope.lookupvar('pam::params::pam_mkhomedir_session') %>
 <% end -%>
 
 session	[default=1]	pam_permit.so
@@ -13,5 +13,5 @@ session	required	pam_permit.so
 session	required	pam_unix.so 
 <% if scope.lookupvar('pam::pamd::pam_ldap') == true then -%>
 #session	optional	pam_ldap.so 
-session	<%= scope.lookupvar('pam::pamd::pam_ldap_session_set') %>
+session	<%= scope.lookupvar('pam::params::pam_ldap_session') %>
 <% end -%>