diff --git a/debian/changelog b/debian/changelog
index 334517ac5..4a5f921bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.16-13) UNRELEASED; urgency=low
+
+  [ Frederik Schüler ]
+  * Add stable release 2.6.16.14:
+    - smbfs chroot issue (CVE-2006-1864)
+
+ -- Frederik Schüler <fs@debian.org>  Fri,  5 May 2006 08:54:42 +0200
+
 linux-2.6 (2.6.16-12) unstable; urgency=low
 
   [ Bastian Blank ]
diff --git a/debian/patches/2.6.16.14 b/debian/patches/2.6.16.14
new file mode 100644
index 000000000..8c7b4b83c
--- /dev/null
+++ b/debian/patches/2.6.16.14
@@ -0,0 +1,16 @@
+diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
+index 0424d06..45862ec 100644
+--- a/fs/smbfs/dir.c
++++ b/fs/smbfs/dir.c
+@@ -434,6 +434,11 @@ smb_lookup(struct inode *dir, struct den
+ 	if (dentry->d_name.len > SMB_MAXNAMELEN)
+ 		goto out;
+ 
++	/* Do not allow lookup of names with backslashes in */
++	error = -EINVAL;
++	if (memchr(dentry->d_name.name, '\\', dentry->d_name.len))
++		goto out;
++
+ 	lock_kernel();
+ 	error = smb_proc_getattr(dentry, &finfo);
+ #ifdef SMBFS_PARANOIA
diff --git a/debian/patches/series/13 b/debian/patches/series/13
new file mode 100644
index 000000000..37f36f493
--- /dev/null
+++ b/debian/patches/series/13
@@ -0,0 +1 @@
++ 2.6.16.14