diff -u cryptsetup-1.0.4+svn26/debian/changelog cryptsetup-1.0.4+svn26/debian/changelog
--- cryptsetup-1.0.4+svn26/debian/changelog
+++ cryptsetup-1.0.4+svn26/debian/changelog
@@ -1,3 +1,9 @@
+cryptsetup (2:1.0.4+svn26-1ubuntu2) feisty; urgency=low
+
+  * Fix Ubuntu bug 85640 with Carsten Schabacker's patch (a little bit reworked)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu,  5 Apr 2007 19:26:41 +0200
+
 cryptsetup (2:1.0.4+svn26-1ubuntu1) feisty; urgency=low
 
   * merge debian changes. Remaining ubuntu changes:
diff -u cryptsetup-1.0.4+svn26/debian/initramfs-cryptroot-script cryptsetup-1.0.4+svn26/debian/initramfs-cryptroot-script
--- cryptsetup-1.0.4+svn26/debian/initramfs-cryptroot-script
+++ cryptsetup-1.0.4+svn26/debian/initramfs-cryptroot-script
@@ -170,6 +170,8 @@
 		activate_vg $cryptsource
 		activate_evms $cryptsource
 	fi
+	# Wait for udev to be ready
+	/sbin/udevsettle --timeout=30
 
 	if [ ! -e $cryptsource ]; then
 		echo "cryptsetup: Source device $cryptsource not found"
@@ -245,6 +247,8 @@
 	done
 
 	if [ $count -lt 3 ]; then
+	# Wait for udev to be ready
+	/sbin/udevsettle --timeout=30
 		return 0
 	else
 		echo "cryptsetup: maximum number of tries exceeded"