diff --git a/NEWS b/NEWS
index 28330fdf4d7fc8e7dc00a3d2111e880e24bb45e5..e7d9b87a88823439f881a0d95c9352eab9448d5a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+UNRELEASED
+
+    [pam] Stop overriding common PAM files with Debian jessie. (akkornel)
+
 release/004.056 (2015-11-05)
 
     [sudo] Add an option to support sudo-with-Duo. (adamhl)
diff --git a/manifests/pam/debian.pp b/manifests/pam/debian.pp
index dfbdbd4dfaf87410d11016e7a9a1dcfe35e8b6b6..7d96a8abf64870aa6bfd7236fe4dc1d2e236132d 100644
--- a/manifests/pam/debian.pp
+++ b/manifests/pam/debian.pp
@@ -5,18 +5,22 @@
 class base::pam::debian {
   package { 'libpam-krb5': ensure => present }
   package { 'libpam-afs-session': ensure => present }
-  file {
-    '/etc/pam.d/common-auth':
-      source  => 'puppet:///modules/base/pam/etc/pam.d/common-auth',
-      require => [ Package['libpam-afs-session'],
-                   Package['libpam-krb5'] ];
-   '/etc/pam.d/common-account':
-      source  => 'puppet:///modules/base/pam/etc/pam.d/common-account',
-      require => [ Package['libpam-krb5'] ];
-   '/etc/pam.d/common-session':
-      source  => 'puppet:///modules/base/pam/etc/pam.d/common-session',
-      require => [ Package['libpam-afs-session'],
-                   Package['libpam-krb5'] ];
+
+  # Starting with Debian jessie, pam-auth-update manages the common PAM files.
+  if ($::lsdbmajdistrelease < 8) {
+    file {
+      '/etc/pam.d/common-auth':
+        source  => 'puppet:///modules/base/pam/etc/pam.d/common-auth',
+        require => [ Package['libpam-afs-session'],
+                     Package['libpam-krb5'] ];
+     '/etc/pam.d/common-account':
+        source  => 'puppet:///modules/base/pam/etc/pam.d/common-account',
+        require => [ Package['libpam-krb5'] ];
+     '/etc/pam.d/common-session':
+        source  => 'puppet:///modules/base/pam/etc/pam.d/common-session',
+        require => [ Package['libpam-afs-session'],
+                     Package['libpam-krb5'] ];
+    }
   }
 }