diff -u libpam-mount-1.5/debian/changelog libpam-mount-1.5/debian/changelog
--- libpam-mount-1.5/debian/changelog
+++ libpam-mount-1.5/debian/changelog
@@ -1,3 +1,9 @@
+libpam-mount (1.5-1ubuntu2) jaunty; urgency=low
+
+  * mount.crypt: Pass -s option to cryptsetup (LP: #367577)
+
+ -- Kenny Millington <kmdm2@kennynet.co.uk>  Sun, 26 Apr 2009 21:41:59 +0100
+
 libpam-mount (1.5-1ubuntu1) jaunty; urgency=low
 
   * Implement https://wiki.ubuntu.com/PAMConfigFrameworkSpec by adding
diff -u libpam-mount-1.5/debian/patches/00list libpam-mount-1.5/debian/patches/00list
--- libpam-mount-1.5/debian/patches/00list
+++ libpam-mount-1.5/debian/patches/00list
@@ -2,0 +3 @@
+11_cryptsetup_s_arg
only in patch2:
unchanged:
--- libpam-mount-1.5.orig/debian/patches/11_cryptsetup_s_arg.dpatch
+++ libpam-mount-1.5/debian/patches/11_cryptsetup_s_arg.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_cryptsetup_s_arg.dpatch by Kenny Millington <kmdm2@kennynet.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad libpam-mount-1.5~/src/loop.c libpam-mount-1.5/src/loop.c
+--- libpam-mount-1.5~/src/loop.c	2008-12-08 01:02:18.000000000 +0000
++++ libpam-mount-1.5/src/loop.c	2009-04-26 21:40:41.000000000 +0100
+@@ -13,6 +13,7 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <limits.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -203,7 +204,8 @@
+ 	int fd_stdin, ret;
+ 	pid_t pid;
+ 	bool is_luks = false;
+-	const char *start_args[11];
++	const char *start_args[13];
++	char key_size[sizeof(-4294967296)];
+ 
+ 	ret = ehd_is_luks(ctl->lower_device, true);
+ 	if (ret >= 0) {
+@@ -225,6 +227,10 @@
+ 			start_args[argk++] = "--key-file=-";
+ 			start_args[argk++] = "-h";
+ 			start_args[argk++] = ctl->hash;
++			start_args[argk++] = "-s";
++			snprintf(key_size, sizeof(key_size), "%u", 
++				 ctl->fskey_size * CHAR_BIT);
++			start_args[argk++] = key_size;
+ 			start_args[argk++] = "create";
+ 			start_args[argk++] = ctl->crypto_name;
+ 			start_args[argk++] = ctl->lower_device;