diff -u ecryptfs-utils-50/debian/changelog ecryptfs-utils-50/debian/changelog
--- ecryptfs-utils-50/debian/changelog
+++ ecryptfs-utils-50/debian/changelog
@@ -1,3 +1,10 @@
+ecryptfs-utils (50-4ubuntu3) intrepid; urgency=low
+
+  * debian/ecryptfs.acc: add pam_ecryptfs to the pam password stack, make all
+    of the pam_ecryptfs entry's 'optional', (LP: #253816).
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 01 Aug 2008 17:53:20 -0500
+
 ecryptfs-utils (50-4ubuntu2) intrepid; urgency=low
 
   * debian/patches/00list, debian/patches/05-pam_ecryptfs_waitpid.dpatch:
diff -u ecryptfs-utils-50/debian/ecryptfs.acc ecryptfs-utils-50/debian/ecryptfs.acc
--- ecryptfs-utils-50/debian/ecryptfs.acc
+++ ecryptfs-utils-50/debian/ecryptfs.acc
@@ -4,3 +4,7 @@
-	auth	required	pam_ecryptfs.so unwrap
+	auth	optional	pam_ecryptfs.so unwrap
 pam_session=session	required	pam_unix.so
 	session optional	pam_ecryptfs.so unwrap
+pam_password=password   requisite   pam_unix.so nullok obscure md5
+	password   optional   pam_smbpass.so nullok use_authtok use_first_pass missingok
+	password   optional	pam_ecryptfs.so
+