diff --git a/templates/syslog/rsyslog.conf.erb b/templates/syslog/rsyslog.conf.erb
index 98c523be5d4f6edb0d97622184979de0e00ccc61..bece0bcf9d7bb149af26dd27198c42fe71897f00 100644
--- a/templates/syslog/rsyslog.conf.erb
+++ b/templates/syslog/rsyslog.conf.erb
@@ -13,11 +13,24 @@ $ModLoad imklog
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 
 # Default permissions for log files.
+<% if ( @operatingsystem == 'Ubuntu' ) %>
+$FileOwner syslog
+$FileGroup adm
+$Umask 0022
+$PrivDropToUser syslog
+$PrivDropToGroup syslog
+<% else %>
 $FileOwner root
 $FileGroup root
+<% end %>
+$WorkDirectory /var/spool/rsyslog
 $FileCreateMode 0640
 $DirCreateMode 0755
-$WorkDirectory /var/spool/rsyslog
+
+<% if ( @operatingsystem == 'Ubuntu' ) %>
+# Enable non-kernel facility klog messages
+$KLogPermitNonKernelFacility on
+<% end %>
 
 <%# Disable rate limiting on >= Debian Wheezy, Ubuntu Precise and RHEL6. -%>
 <% if ( @operatingsystem == 'Ubuntu' && @lsbmajdistrelease.to_i() >= 12 ) ||