diff --git a/boot.crypto-0_200910071414.tar.bz2 b/boot.crypto-0_200910071414.tar.bz2
deleted file mode 100644
index 0dc7021..0000000
--- a/boot.crypto-0_200910071414.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb92b934bba1e5d73d8ef91e11c6592076ab97a8126e0eaf14e659cd2f9341df
-size 17889
diff --git a/boot.crypto-0_200910161438.tar.bz2 b/boot.crypto-0_200910161438.tar.bz2
new file mode 100644
index 0000000..934e397
--- /dev/null
+++ b/boot.crypto-0_200910161438.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b59733fc05021a9251a68b34de6ac139d8a9607bef6e36fd3c1533c95d510b0
+size 17922
diff --git a/cryptsetup.changes b/cryptsetup.changes
index 36ca9d5..f2abde5 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 19 14:33:57 UTC 2009 - lnussel@suse.de
+
+- add luks script in volumemanager stage too, this way some side
+  effects are avoided (bnc#547612)
+
 -------------------------------------------------------------------
 Wed Oct  7 12:37:24 UTC 2009 - lnussel@suse.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 52ab535..6f1475b 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_200910071414
+%define bcver 0_200910161438
 License:        BSD 3-clause (or similar) ; GPL v2 only ; GPL v2 or later
 Group:          System/Base
 AutoReqProv:    on
@@ -205,6 +205,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/setup-luks.sh
 /lib/mkinitrd/scripts/boot-luks.sh
+/lib/mkinitrd/scripts/setup-luks2.sh
+/lib/mkinitrd/scripts/setup-luks_final.sh
 /sbin/cryptsetup
 /sbin/hashalot
 /sbin/rccrypto