diff --git a/boot.crypto-0_200909211050.tar.bz2 b/boot.crypto-0_200909211050.tar.bz2
deleted file mode 100644
index 3ab0113..0000000
--- a/boot.crypto-0_200909211050.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32bdc236d3d90ee0d099d78b0d931fb3d179907a547fea83bc8d043bedb3d752
-size 17650
diff --git a/boot.crypto-0_200909241534.tar.bz2 b/boot.crypto-0_200909241534.tar.bz2
new file mode 100644
index 0000000..d0ea541
--- /dev/null
+++ b/boot.crypto-0_200909241534.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96a97717ba452c351ccd253f7507ebf58be3e94e7ae4b02790828d6b5327f9ec
+size 17730
diff --git a/cryptsetup.changes b/cryptsetup.changes
index 66d3ec4..59db7b4 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Sep 24 13:36:52 UTC 2009 - lnussel@suse.de
+
+- boot.crypto:
+  * don't use hashalot if keyfile is specified
+  * to comply with Debian, keyscripts must only output the password.
+    In order to allow keyscript to use different methods to retrieve
+    a key, add a keyscript_rawkey option.
+
 -------------------------------------------------------------------
 Mon Sep 21 08:51:40 UTC 2009 - lnussel@suse.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 7271d6c..9704212 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -25,7 +25,7 @@ BuildRequires:  libselinux-devel
 # hashalot version
 %define haver 0.3 
 # boot.crypto version
-%define bcver 0_200909211050
+%define bcver 0_200909241534
 License:        BSD 3-clause (or similar) ; GPL v2 only ; GPL v2 or later
 Group:          System/Base
 AutoReqProv:    on
@@ -38,6 +38,7 @@ Source1:        hashalot-%haver.tar.bz2
 Source2:        boot.crypto-%{bcver}.tar.bz2
 # use this to create the tarball from svn
 Source99:       cryptsetup-mktar
+Patch0:         cryptsetup-1.0.7-eofpw.diff
 Patch10:        hashalot-fixes.diff
 Patch11:        hashalot-libgcrypt.diff
 Patch12:        hashalot-ctrl-d.diff
@@ -114,6 +115,7 @@ Authors:
 
 %prep
 %setup -q -b 1 -b 2
+%patch0 -p1
 pushd ../hashalot-%haver
 %patch10 -p1
 %patch11 -p1