diff -u ecryptfs-utils-50/debian/libecryptfs0.install ecryptfs-utils-50/debian/libecryptfs0.install
--- ecryptfs-utils-50/debian/libecryptfs0.install
+++ ecryptfs-utils-50/debian/libecryptfs0.install
@@ -3,0 +4 @@
+/etc/auth-client-config/profile.d/ecryptfs
diff -u ecryptfs-utils-50/debian/rules ecryptfs-utils-50/debian/rules
--- ecryptfs-utils-50/debian/rules
+++ ecryptfs-utils-50/debian/rules
@@ -54,6 +54,7 @@
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	cp $(CURDIR)/debian/ecryptfs.acc $(CURDIR)/debian/libecryptfs0/etc/auth-client-config/profile.d/ecryptfs
 
 	chmod 4755 debian/tmp/sbin/mount.ecryptfs_private
 
@@ -64,7 +65,7 @@
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
-	dh_install --fail-missing --sourcedir=debian/tmp
+	dh_install --fail-missing --sourcedir=debian/tmp -Xetc/auth-client-config/profile.d/ecryptfs
 	dh_lintian
 	dh_strip
 	dh_compress
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,14 @@
+ecryptfs-utils (50-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #248420), remaining changes:
+   - debian/libecryptfs0.install: add ecryptfs auth-client-config profile
+   - debian/rules: support ecryptfs auth-client-config profile
+   - debian/control: Update maintainer, suggest auth-client-config
+   - debian/libecryptfs0.dirs: add etc/auth-client-config/profile.d
+   - debian/ecryptfs.acc: define auth-client-config profile
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 14 Jul 2008 09:48:23 -0500
+
 ecryptfs-utils (50-3) unstable; urgency=low
 
   * Adding missing build-depends to pkg-config (Closes: #490415).
@@ -13,6 +24,17 @@
 
  -- Daniel Baumann <daniel@debian.org>  Thu, 10 Jul 2008 23:48:00 +0200
 
+ecryptfs-utils (50-1ubuntu1) intrepid; urgency=low
+
+  * auth-client-config support (LP: #247641)
+    + debian/ecryptfs.acc: create an auth-client-config profile
+    + debian/libecryptfs0.install: install the auth-client-config profile
+    + debian/control: modify maintainer value; add auth-client-config to
+      Suggests
+    + debian/libecryptfs0.dirs: create with etc/auth-client-config/profile.d
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 11 Jul 2008 12:00:36 -0500
+
 ecryptfs-utils (50-1) unstable; urgency=low
 
   * Merging upstream version 50.
@@ -159,0 +182 @@
+
diff -u ecryptfs-utils-50/debian/control ecryptfs-utils-50/debian/control
--- ecryptfs-utils-50/debian/control
+++ ecryptfs-utils-50/debian/control
@@ -1,7 +1,8 @@
 Source: ecryptfs-utils
 Section: misc
 Priority: optional
-Maintainer: Daniel Baumann <daniel@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7), dpatch, autotools-dev, autoconf, automake, libtool, libgcrypt11-dev, libgpg-error-dev, libgpgme11-dev, libkeyutils-dev, libopencryptoki-dev [alpha amd64 arm armel hppa ia64 i386 m68k mips mipsel powerpc sparc], libpam0g-dev, libpkcs11-helper1-dev, libssl-dev, libtspi-dev [alpha amd64 arm armel hppa ia64 i386 m68k mips mipsel powerpc sparc], pkg-config
 Standards-Version: 3.8.0
 Homepage: http://ecryptfs.sourceforge.net/
@@ -33,6 +34,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: auth-client-config
 Description: ecryptfs cryptographic filesystem (library)
  eCryptfs is a POSIX-compliant enterprise-class stacked cryptographic filesystem
  for Linux.
only in patch2:
unchanged:
--- ecryptfs-utils-50.orig/debian/libecryptfs0.dirs
+++ ecryptfs-utils-50/debian/libecryptfs0.dirs
@@ -0,0 +1 @@
+etc/auth-client-config/profile.d
only in patch2:
unchanged:
--- ecryptfs-utils-50.orig/debian/ecryptfs.acc
+++ ecryptfs-utils-50/debian/ecryptfs.acc
@@ -0,0 +1,6 @@
+[ecryptfs_standard]
+pam_auth=auth	requisite	pam_unix.so nullok_secure
+	auth	optional	pam_smbpass.so migrate missingok
+	auth	required	pam_ecryptfs.so unwrap
+pam_session=session	required	pam_unix.so
+	session optional	pam_ecryptfs.so unwrap