diff -u linux-2.6.24/debian/changelog linux-2.6.24/debian/changelog
--- linux-2.6.24/debian/changelog
+++ linux-2.6.24/debian/changelog
@@ -1,3 +1,10 @@
+linux (2.6.24-19.33.1) UNRELEASED; urgency=low
+
+  * enable CONFIG_CIFS_EXPERIMENTAL, needed for kerberos authentication
+    with mount.cifs.  LP: #236830.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 09 Jun 2008 02:16:41 +0000
+
 linux (2.6.24-19.33) hardy-proposed; urgency=low
 
   [Alessio Igor Bogani]
diff -u linux-2.6.24/debian/config/i386/config linux-2.6.24/debian/config/i386/config
--- linux-2.6.24/debian/config/i386/config
+++ linux-2.6.24/debian/config/i386/config
@@ -158,7 +158,8 @@
 CONFIG_CHR_DEV_SG=m
 CONFIG_CIFS=m
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_UPCALL=y
 # CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
 # CONFIG_CIFS_XATTR is not set
diff -u linux-2.6.24/debian/config/amd64/config linux-2.6.24/debian/config/amd64/config
--- linux-2.6.24/debian/config/amd64/config
+++ linux-2.6.24/debian/config/amd64/config
@@ -388,7 +388,8 @@
 CONFIG_CICADA_PHY=m
 CONFIG_CIFS=m
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_UPCALL=y
 # CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
 # CONFIG_CIFS_XATTR is not set