diff --git a/e2fsprogs-1.40.8-e2fsck_recovery_fix.patch b/e2fsprogs-1.40.8-e2fsck_recovery_fix.patch
new file mode 100644
index 0000000..a5a73d0
--- /dev/null
+++ b/e2fsprogs-1.40.8-e2fsck_recovery_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
+index 22e79a5..f7fd7b6 100644
+--- a/e2fsck/recovery.c
++++ b/e2fsck/recovery.c
+@@ -473,7 +473,7 @@ static int do_one_pass(journal_t *journal,
+ 					memcpy(nbh->b_data, obh->b_data,
+ 							journal->j_blocksize);
+ 					if (flags & JFS_FLAG_ESCAPE) {
+-						*((unsigned int *)bh->b_data) =
++						*((unsigned int *)nbh->b_data) =
+ 							htonl(JFS_MAGIC_NUMBER);
+ 					}
+ 
diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index 0890902..c14356f 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 21 14:52:36 CEST 2008 - mkoenig@suse.de
+
+- e2fsck: Fix potential data corruptor bug in journal recovery
+  [bnc#393095]
+
 -------------------------------------------------------------------
 Tue May 13 11:59:37 CEST 2008 - mkoenig@suse.de
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index e234797..f50809e 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -20,7 +20,7 @@ Supplements:    filesystem(ext2) filesystem(ext3)
 PreReq:         %install_info_prereq
 AutoReqProv:    on
 Version:        1.40.8
-Release:        14
+Release:        16
 Summary:        Utilities for the Second Extended File System
 Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
@@ -38,6 +38,7 @@ Patch5:         e2fsprogs-1.40.4-uuidd_pid_path.patch
 Patch6:         e2fsprogs-1.40.7-uuidd_security.patch
 Patch7:         e2fsprogs-1.40.8-fix_ext2fs_swap_inode_full.patch
 Patch8:         e2fsprogs-1.40.8-missing_init.patch
+Patch9:         e2fsprogs-1.40.8-e2fsck_recovery_fix.patch
 # libcom_err patches
 # 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict
 Patch31:        libcom_err-no-init_error_table.patch
@@ -243,6 +244,7 @@ Authors:
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 # libcom_err patches
 %patch31 -p1 
 %patch32 -p1
@@ -449,6 +451,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/com_err.3.gz
 
 %changelog
+* Wed May 21 2008 mkoenig@suse.de
+- e2fsck: Fix potential data corruptor bug in journal recovery
+  [bnc#393095]
 * Tue May 13 2008 mkoenig@suse.de
 - libuuid: do not use unintialized variable [bnc#386649]
 * Wed May 07 2008 coolo@suse.de