diff --git a/e2fsprogs-1.40.11.tar.bz2 b/e2fsprogs-1.40.11.tar.bz2
deleted file mode 100644
index 848b676..0000000
--- a/e2fsprogs-1.40.11.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9cb28087c64794a351f2f7c50e9bdb54549a36cbaddd53beb67ac4bb7f5ae310
-size 3665533
diff --git a/e2fsprogs-1.41.0-tst_link_fix.patch b/e2fsprogs-1.41.0-tst_link_fix.patch
new file mode 100644
index 0000000..b2a9291
--- /dev/null
+++ b/e2fsprogs-1.41.0-tst_link_fix.patch
@@ -0,0 +1,26 @@
+Index: e2fsprogs-1.41.0/e2fsck/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.0.orig/e2fsck/Makefile.in	2008-06-19 17:57:59.000000000 +0200
++++ e2fsprogs-1.41.0/e2fsck/Makefile.in	2008-07-11 15:19:01.000000000 +0200
+@@ -138,7 +138,7 @@ crc32table.h: gen_crc32table
+ 
+ tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
+ 	@$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
+-		-DUNITTEST $(LIBEXT2FS)
++		-DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) 
+ 
+ tst_refcount: ea_refcount.c
+ 	@echo "	LD $@"
+@@ -151,9 +151,9 @@ tst_region: region.c
+ 		$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
+ 
+ check:: tst_refcount tst_region tst_crc32
+-	./tst_refcount
+-	./tst_region
+-	./tst_crc32
++	LD_LIBRARY_PATH=$(top_builddir)/lib ./tst_refcount
++	LD_LIBRARY_PATH=$(top_builddir)/lib ./tst_region
++	LD_LIBRARY_PATH=$(top_builddir)/lib ./tst_crc32
+ 
+ extend: extend.o
+ 	@echo "	LD $@"
diff --git a/e2fsprogs-1.41.0.tar.bz2 b/e2fsprogs-1.41.0.tar.bz2
new file mode 100644
index 0000000..69702cf
--- /dev/null
+++ b/e2fsprogs-1.41.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d917cc9e6153f644ed91b0a5af6a3a10c47712d2335fd0dd6fcaa7088e612fc2
+size 3823614
diff --git a/e2fsprogs-no_cmd_hiding.patch b/e2fsprogs-no_cmd_hiding.patch
index 8b07404..d781719 100644
--- a/e2fsprogs-no_cmd_hiding.patch
+++ b/e2fsprogs-no_cmd_hiding.patch
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.40.7/lib/Makefile.elf-lib
+Index: e2fsprogs-1.41.0/lib/Makefile.elf-lib
 ===================================================================
---- e2fsprogs-1.40.7.orig/lib/Makefile.elf-lib
-+++ e2fsprogs-1.40.7/lib/Makefile.elf-lib
+--- e2fsprogs-1.41.0.orig/lib/Makefile.elf-lib	2008-01-01 22:47:01.000000000 +0100
++++ e2fsprogs-1.41.0/lib/Makefile.elf-lib	2008-07-11 15:38:19.000000000 +0200
 @@ -15,7 +15,7 @@ all:: image
  
  real-subdirs:: Makefile
@@ -11,11 +11,11 @@ Index: e2fsprogs-1.40.7/lib/Makefile.elf-lib
  
  ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
  ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
-Index: e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
+Index: e2fsprogs-1.41.0/lib/ext2fs/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/lib/ext2fs/Makefile.in
-+++ e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
-@@ -164,12 +164,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
+--- e2fsprogs-1.41.0.orig/lib/ext2fs/Makefile.in	2008-07-10 23:25:33.000000000 +0200
++++ e2fsprogs-1.41.0/lib/ext2fs/Makefile.in	2008-07-11 15:40:48.000000000 +0200
+@@ -175,149 +175,118 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  all:: ext2fs.pc
  
  .c.o:
@@ -33,33 +33,44 @@ Index: e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
  
  COMPILE_ET=../et/compile_et --build-tree
  
-@@ -189,61 +188,49 @@ ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_
+ DISTFILES= Makefile *.c *.h image
  
- tst_badblocks: tst_badblocks.o freefs.o \
- 		read_bb_file.o write_bb_file.o badblocks.o 
--	@echo "	LD $@"
--	@$(CC) -o tst_badblocks tst_badblocks.o freefs.o \
-+	$(CC) -o tst_badblocks tst_badblocks.o freefs.o \
- 		read_bb_file.o write_bb_file.o badblocks.o \
- 		inline.o bitops.o gen_bitmap.o $(LIBCOM_ERR)
+ ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
++	$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
  
- tst_icount: icount.c initialize.o  $(STATIC_LIBEXT2FS)
+ ext2_err.c ext2_err.h: ext2_err.et
+-	@echo "	COMPILE_ET ext2_err.et"
+-	@$(COMPILE_ET) ext2_err.et
++	$(COMPILE_ET) ext2_err.et
+ 
+ ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_builddir)/config.status
+-	@echo "	CONFIG.STATUS $@"
+-	@cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
++	cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
+ 
+ tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
--	@$(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
-+	$(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
- 		-DDEBUG $(ALL_CFLAGS) \
+-	@$(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
++	$(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
+ 		$(LIBCOM_ERR)
+ 
+ tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS)
+-	@echo "	LD $@"
+-	@$(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
++	$(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
  		$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
  
- tst_iscan: tst_iscan.o inode.o badblocks.o test_io.o $(STATIC_LIBEXT2FS)
+ tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
--	@$(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \
-+	$(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \
- 		$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
+-	@$(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
++	$(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
  
- tst_getsize: tst_getsize.o getsize.o $(STATIC_LIBEXT2FS)
+ tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
--	@$(CC) -o tst_getsize tst_getsize.o getsize.o $(STATIC_LIBEXT2FS) \
-+	$(CC) -o tst_getsize tst_getsize.o getsize.o $(STATIC_LIBEXT2FS) \
+-	@$(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
++	$(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
  		$(LIBCOM_ERR)
  
  tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
@@ -67,22 +78,22 @@ Index: e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
 -	@$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) 
 +	$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) 
  
- tst_byteswap: tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS)
+ tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
--	@$(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \
-+	$(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \
+-	@$(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
++	$(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
  		$(LIBCOM_ERR)
  
- tst_bitops: tst_bitops.o inline.o $(STATIC_LIBEXT2FS)
+ tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
--	@$(CC) -o tst_bitops tst_bitops.o inline.o $(ALL_CFLAGS) \
-+	$(CC) -o tst_bitops tst_bitops.o inline.o $(ALL_CFLAGS) \
+-	@$(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
++	$(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
  		$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
  
- tst_getsectsize: tst_getsectsize.o getsectsize.o $(STATIC_LIBEXT2FS)
+ tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
--	@$(CC) -o tst_sectgetsize tst_getsectsize.o getsectsize.o \
-+	$(CC) -o tst_sectgetsize tst_getsectsize.o getsectsize.o \
+-	@$(CC) -o tst_sectgetsize tst_getsectsize.o \
++	$(CC) -o tst_sectgetsize tst_getsectsize.o \
  		$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
  
  tst_types: tst_types.o ext2_types.h 
@@ -100,15 +111,97 @@ Index: e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
 -	@$(CC) -o ext2_tdbtool tdbtool.o tdb.o
 +	$(CC) -o ext2_tdbtool tdbtool.o tdb.o
  
+ extent_dbg.c: $(srcdir)/extent_dbg.ct
+-	@echo "	MK_CMDS $<"
+-	@$(MK_CMDS) $(srcdir)/extent_dbg.ct
++	$(MK_CMDS) $(srcdir)/extent_dbg.ct
+ 
+ debug_cmds.c debug_cmds.h: $(top_srcdir)/debugfs/debug_cmds.ct
+-	@echo "	MK_CMDS $<@"
+-	@$(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
++	$(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
+ 
+ DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
+ 	lsdel.o dump.o set_fields.o logdump.o htree.o unused.o
+ 
+ debugfs.o: $(top_srcdir)/debugfs/debugfs.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ util.o: $(top_srcdir)/debugfs/util.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ ncheck.o: $(top_srcdir)/debugfs/ncheck.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ icheck.o: $(top_srcdir)/debugfs/icheck.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ ls.o: $(top_srcdir)/debugfs/ls.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ lsdel.o: $(top_srcdir)/debugfs/lsdel.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ dump.o: $(top_srcdir)/debugfs/dump.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ set_fields.o: $(top_srcdir)/debugfs/set_fields.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ logdump.o: $(top_srcdir)/debugfs/logdump.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ htree.o: $(top_srcdir)/debugfs/htree.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ unused.o: $(top_srcdir)/debugfs/unused.c
+-	@echo "	CC $<"
+-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID)
+-	@echo "	LD $@"
+-	@$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
++	$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
+ 		$(ALL_CFLAGS) -DDEBUG $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) \
+ 		$(STATIC_LIBEXT2FS) $(LIBBLKID) $(LIBUUID) $(LIBCOM_ERR) \
+ 		-I $(top_srcdir)/debugfs
+ 
+ tst_csum: tst_csum.c csum.c $(STATIC_LIBEXT2FS)
+-	@echo "	LD $@"
+-	@$(CC) -o tst_csum $(srcdir)/csum.c $(srcdir)/tst_csum.c -DDEBUG \
++	$(CC) -o tst_csum $(srcdir)/csum.c $(srcdir)/tst_csum.c -DDEBUG \
+ 		$(ALL_CFLAGS) $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
+ 
  mkjournal: mkjournal.c $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
 -	@$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
 +	$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
  
- check:: tst_bitops tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap \
- 	tst_types tst_icount tst_super_size
-@@ -256,13 +243,11 @@ check:: tst_bitops tst_badblocks tst_isc
- 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size
+ check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size tst_types tst_csum
+ 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops
+@@ -329,13 +298,11 @@ check:: tst_bitops tst_badblocks tst_isc
+ 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
  
  installdirs::
 -	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
@@ -123,10 +216,10 @@ Index: e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
  	@-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
  	@$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
  	@for i in $(HFILES); do \
-Index: e2fsprogs-1.40.7/lib/blkid/Makefile.in
+Index: e2fsprogs-1.41.0/lib/blkid/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/lib/blkid/Makefile.in
-+++ e2fsprogs-1.40.7/lib/blkid/Makefile.in
+--- e2fsprogs-1.41.0.orig/lib/blkid/Makefile.in	2007-06-30 14:58:34.000000000 +0200
++++ e2fsprogs-1.41.0/lib/blkid/Makefile.in	2008-07-11 15:38:19.000000000 +0200
 @@ -54,8 +54,7 @@ LIBS_BLKID=	$(STATIC_LIBBLKID) $(STATIC_
  DEPLIBS_BLKID=	$(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
  
@@ -208,10 +301,10 @@ Index: e2fsprogs-1.40.7/lib/blkid/Makefile.in
  
  test_probe: test_probe.in Makefile
  	@echo "Creating test_probe..."
-Index: e2fsprogs-1.40.7/lib/e2p/Makefile.in
+Index: e2fsprogs-1.41.0/lib/e2p/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/lib/e2p/Makefile.in
-+++ e2fsprogs-1.40.7/lib/e2p/Makefile.in
+--- e2fsprogs-1.41.0.orig/lib/e2p/Makefile.in	2007-06-30 14:58:34.000000000 +0200
++++ e2fsprogs-1.41.0/lib/e2p/Makefile.in	2008-07-11 15:38:19.000000000 +0200
 @@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  @MAKEFILE_CHECKER@
  
@@ -232,10 +325,10 @@ Index: e2fsprogs-1.40.7/lib/e2p/Makefile.in
  		$(srcdir)/ostype.c $(ALL_CFLAGS)
  
  check::	tst_ostype
-Index: e2fsprogs-1.40.7/lib/ss/Makefile.in
+Index: e2fsprogs-1.41.0/lib/ss/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/lib/ss/Makefile.in
-+++ e2fsprogs-1.40.7/lib/ss/Makefile.in
+--- e2fsprogs-1.41.0.orig/lib/ss/Makefile.in	2008-06-18 05:53:42.000000000 +0200
++++ e2fsprogs-1.41.0/lib/ss/Makefile.in	2008-07-11 15:42:16.000000000 +0200
 @@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
  XTRA_CFLAGS= -I$(srcdir)/../et
  
@@ -254,8 +347,20 @@ Index: e2fsprogs-1.40.7/lib/ss/Makefile.in
  
  # for the library
  
-@@ -106,8 +105,7 @@ test_cmd.c: test_cmd.ct mk_cmds
- 	@DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
+@@ -96,18 +95,15 @@ FILES=	$(SRCS) $(MKCMDSFILES) $(HFILES)
+ all::	libss.a ss.pc # libss_p.a lint
+ 
+ std_rqs.c: std_rqs.ct mk_cmds
+-	@echo "	MK_CMDS $@"
+-	@DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
++	DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
+ 
+ std_rqs.o: ss_err.h
+ 
+ test_cmd.c: test_cmd.ct mk_cmds
+-	@echo "	MK_CMDS $@"
+-	@DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
++	DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
  
  ss_err.c ss_err.h: ss_err.et
 -	@echo "	COMPILE_ET ss_err.et"
@@ -264,7 +369,7 @@ Index: e2fsprogs-1.40.7/lib/ss/Makefile.in
  
  ct.tab.c ct.tab.h: ct.y
  	$(RM) -f ct.tab.* y.*
-@@ -120,9 +118,8 @@ ct.tab.c ct.tab.h: ct.y
+@@ -120,17 +116,14 @@ ct.tab.c ct.tab.h: ct.y
  #	$(CHMOD) -x $@
  
  mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in
@@ -275,22 +380,31 @@ Index: e2fsprogs-1.40.7/lib/ss/Makefile.in
 +	$(CHMOD) +x mk_cmds
  
  ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status
- 	@echo "	CONFIG.STATUS $@"
-@@ -164,8 +161,8 @@ uninstall::
+-	@echo "	CONFIG.STATUS $@"
+-	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
++	cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
+ 
+@@ -164,8 +157,7 @@ uninstall::
  	$(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
  
- test_ss: test_ss.o test_cmd.o $(LIBSS) $(LIBCOM_ERR)
+ test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(LIBCOM_ERR)
 -	@echo "	LD $@"
 -	@$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
-+	echo "	LD $@"
 +	$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
  		$(LIBSS) $(LIBCOM_ERR)
  
  check:: all test_ss
-Index: e2fsprogs-1.40.7/lib/uuid/Makefile.in
+Index: e2fsprogs-1.41.0/lib/uuid/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/lib/uuid/Makefile.in
-+++ e2fsprogs-1.40.7/lib/uuid/Makefile.in
+--- e2fsprogs-1.41.0.orig/lib/uuid/Makefile.in	2008-02-19 05:33:10.000000000 +0100
++++ e2fsprogs-1.41.0/lib/uuid/Makefile.in	2008-07-11 15:38:19.000000000 +0200
 @@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  @MAKEFILE_CHECKER@
  
@@ -375,11 +489,11 @@ Index: e2fsprogs-1.40.7/lib/uuid/Makefile.in
  
  uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
  	@echo "	CONFIG.STATUS $@"
-Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
+Index: e2fsprogs-1.41.0/e2fsck/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/e2fsck/Makefile.in
-+++ e2fsprogs-1.40.7/e2fsck/Makefile.in
-@@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) 
+--- e2fsprogs-1.41.0.orig/e2fsck/Makefile.in	2008-07-11 15:36:39.000000000 +0200
++++ e2fsprogs-1.41.0/e2fsck/Makefile.in	2008-07-11 15:45:54.000000000 +0200
+@@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS)
  COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
  
  .c.o:
@@ -391,8 +505,13 @@ Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
  
  #
  # Flags for using Checker
-@@ -113,45 +112,36 @@ prof_err.c prof_err.h: prof_err.et
- 	@$(COMPILE_ET) $(srcdir)/prof_err.et
+@@ -110,44 +109,36 @@ all:: profiled $(PROGS) e2fsck $(MANPAGE
+ @PROFILE_CMT@all:: e2fsck.profiled
+ 
+ prof_err.c prof_err.h: prof_err.et
+-	@echo "	COMPILE_ET prof_err.et"
+-	@$(COMPILE_ET) $(srcdir)/prof_err.et
++	$(COMPILE_ET) $(srcdir)/prof_err.et
  
  e2fsck: $(OBJS)  $(DEPLIBS)
 -	@echo "	LD $@"
@@ -411,17 +530,37 @@ Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
 +	$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
  		$(PROFILED_LIBS) 
  
+ gen_crc32table: $(srcdir)/gen_crc32table.c
+-	@echo "	CC $@"
+-	@$(BUILD_CC) $(ALL_CFLAGS) -o gen_crc32table \
++	$(BUILD_CC) $(ALL_CFLAGS) -o gen_crc32table \
+ 		$(srcdir)/gen_crc32table.c
+ 
+ crc32table.h: gen_crc32table
+-	@echo "	GEN32TABLE $@"
+-	@./gen_crc32table > crc32table.h
++	./gen_crc32table > crc32table.h
+ 
+ tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
+-	@$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
++	$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
+ 		-DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) 
+ 
  tst_refcount: ea_refcount.c
 -	@echo "	LD $@"
 -	@$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
 +	$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
- 		$(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+ 		$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
  
  tst_region: region.c
 -	@echo "	LD $@"
 -	@$(CC) -o tst_region $(srcdir)/region.c \
 +	$(CC) -o tst_region $(srcdir)/region.c \
- 		$(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+ 		$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
+ 
+ check:: tst_refcount tst_region tst_crc32
+@@ -156,21 +147,17 @@ check:: tst_refcount tst_region tst_crc3
+ 	LD_LIBRARY_PATH=$(top_builddir)/lib ./tst_crc32
  
  extend: extend.o
 -	@echo "	LD $@"
@@ -446,7 +585,7 @@ Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
  		profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \
  		$(ALL_CFLAGS)
  
-@@ -160,16 +150,13 @@ profiled:
+@@ -179,16 +166,13 @@ profiled:
  @PROFILE_CMT@	@mkdir profiled
  
  e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
@@ -466,7 +605,7 @@ Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
  		$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
  
  install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
-@@ -177,11 +164,9 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
+@@ -196,17 +180,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
  		echo "	INSTALL $(root_sbindir)/$$i"; \
  		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
  	done
@@ -478,9 +617,17 @@ Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
 -	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
 +	$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
  			$(DESTDIR)$(root_sbindir)/fsck.ext3
+-	@echo "	LINK $(root_sbindir)/fsck.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext4
+-	@echo "	LINK $(root_sbindir)/fsck.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext4dev
  	@for i in $(MANPAGES); do \
  		for j in $(COMPRESS_EXT); do \
-@@ -197,11 +182,9 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
+@@ -222,17 +202,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
  		echo "	INSTALL_DATA $(man5dir)/$$i"; \
  		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
  	done
@@ -492,14 +639,22 @@ Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
 -	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
 +	$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
  		$(DESTDIR)$(man8dir)/fsck.ext3.8
+-	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext4.8
+-	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext4dev.8
  
  install-strip: install
-Index: e2fsprogs-1.40.7/debugfs/Makefile.in
+Index: e2fsprogs-1.41.0/debugfs/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/debugfs/Makefile.in
-+++ e2fsprogs-1.40.7/debugfs/Makefile.in
-@@ -30,26 +30,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(
- DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
+--- e2fsprogs-1.41.0.orig/debugfs/Makefile.in	2008-06-18 05:53:42.000000000 +0200
++++ e2fsprogs-1.41.0/debugfs/Makefile.in	2008-07-11 15:38:19.000000000 +0200
+@@ -29,26 +29,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(
+ DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
  
  .c.o:
 -	@echo "	CC $<"
@@ -530,10 +685,10 @@ Index: e2fsprogs-1.40.7/debugfs/Makefile.in
  		$(DESTDIR)$(man8dir)
  
  install: $(PROGS) $(MANPAGES) installdirs
-Index: e2fsprogs-1.40.7/resize/Makefile.in
+Index: e2fsprogs-1.41.0/resize/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/resize/Makefile.in
-+++ e2fsprogs-1.40.7/resize/Makefile.in
+--- e2fsprogs-1.41.0.orig/resize/Makefile.in	2007-06-30 14:58:35.000000000 +0200
++++ e2fsprogs-1.41.0/resize/Makefile.in	2008-07-11 15:38:19.000000000 +0200
 @@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L
  STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
  
@@ -572,10 +727,10 @@ Index: e2fsprogs-1.40.7/resize/Makefile.in
  		$(DESTDIR)$(man8dir)
  
  install: $(PROGS) $(MANPAGES) installdirs
-Index: e2fsprogs-1.40.7/util/Makefile.in
+Index: e2fsprogs-1.41.0/util/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/util/Makefile.in
-+++ e2fsprogs-1.40.7/util/Makefile.in
+--- e2fsprogs-1.41.0.orig/util/Makefile.in	2007-06-30 14:58:37.000000000 +0200
++++ e2fsprogs-1.41.0/util/Makefile.in	2008-07-11 15:38:19.000000000 +0200
 @@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c
  @MCONFIG@
  
@@ -600,12 +755,12 @@ Index: e2fsprogs-1.40.7/util/Makefile.in
  
  gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
  	@echo "	CONFIG.STATUS $@"
-Index: e2fsprogs-1.40.7/tests/progs/Makefile.in
+Index: e2fsprogs-1.41.0/tests/progs/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/tests/progs/Makefile.in
-+++ e2fsprogs-1.40.7/tests/progs/Makefile.in
+--- e2fsprogs-1.41.0.orig/tests/progs/Makefile.in	2008-06-18 05:53:42.000000000 +0200
++++ e2fsprogs-1.41.0/tests/progs/Makefile.in	2008-07-11 15:38:19.000000000 +0200
 @@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR
- DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
+ DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(LIBCOM_ERR)
  
  .c.o:
 -	@echo "	CC $<"
@@ -636,10 +791,10 @@ Index: e2fsprogs-1.40.7/tests/progs/Makefile.in
  
  clean:
  	$(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \
-Index: e2fsprogs-1.40.7/lib/et/Makefile.in
+Index: e2fsprogs-1.41.0/lib/et/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/lib/et/Makefile.in
-+++ e2fsprogs-1.40.7/lib/et/Makefile.in
+--- e2fsprogs-1.41.0.orig/lib/et/Makefile.in	2008-07-11 15:36:39.000000000 +0200
++++ e2fsprogs-1.41.0/lib/et/Makefile.in	2008-07-11 15:38:19.000000000 +0200
 @@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  # what to build...
  #
@@ -658,11 +813,11 @@ Index: e2fsprogs-1.40.7/lib/et/Makefile.in
  
  @MAKEFILE_LIBRARY@
  @MAKEFILE_ELF@
-Index: e2fsprogs-1.40.7/misc/Makefile.in
+Index: e2fsprogs-1.41.0/misc/Makefile.in
 ===================================================================
---- e2fsprogs-1.40.7.orig/misc/Makefile.in
-+++ e2fsprogs-1.40.7/misc/Makefile.in
-@@ -71,8 +71,7 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
+--- e2fsprogs-1.41.0.orig/misc/Makefile.in	2008-07-11 15:36:39.000000000 +0200
++++ e2fsprogs-1.41.0/misc/Makefile.in	2008-07-11 15:49:21.000000000 +0200
+@@ -73,190 +73,146 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
  COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
  
  .c.o:
@@ -672,8 +827,16 @@ Index: e2fsprogs-1.40.7/misc/Makefile.in
  
  all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
  	$(FMANPAGES) $(LPROGS)
-@@ -86,91 +85,71 @@ default_profile.c: $(srcdir)/mke2fs.conf
- 	$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
+ 
+ prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et
+-	@echo "	COMPILE_ET prof_err.et"
+-	@$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
++	$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
+ 
+ default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk
+-	@echo "	PROFILE_TO_C mke2fs.conf"
+-	@$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
++	$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
  		>  default_profile.c
  profile.o:
 -	@echo "	CC $<"
@@ -712,6 +875,11 @@ Index: e2fsprogs-1.40.7/misc/Makefile.in
 -	@$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
 +	$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
  
+ e2undo: $(E2UNDO_OBJS) $(DEPLIBS)
+-	@echo "	LD $@"
+-	@$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
++	$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
+ 
  base_device: base_device.c
 -	@echo "	LD $@"
 -	@$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
@@ -783,4 +951,156 @@ Index: e2fsprogs-1.40.7/misc/Makefile.in
 +	$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) 
  
  tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
- 	@echo "	LD $@"
+-	@echo "	LD $@"
+-	$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
++	(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
+ 
+ tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
+ 
+ mklost+found.8: $(DEP_SUBSTITUTE) $(srcdir)/mklost+found.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
+ 
+ mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
+ 
+ mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
++	$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
+ 
+ e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
+ 
+ e2undo.8: $(DEP_SUBSTITUTE) $(srcdir)/e2undo.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
+ 
+ findfs.8: $(DEP_SUBSTITUTE) $(srcdir)/findfs.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
+ 
+ e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
+ 
+ dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in 
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
+ 
+ badblocks.8: $(DEP_SUBSTITUTE) $(srcdir)/badblocks.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8	
++	$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8	
+ 
+ fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 
++	$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 
+ 
+ blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
+ 
+ logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
+ 
+ uuidd.8: $(DEP_SUBSTITUTE) $(srcdir)/uuidd.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
+ 
+ chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 
++	$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 
+ 
+ lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in 
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 
++	$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 
+ 
+ uuidgen.1: $(DEP_SUBSTITUTE) $(srcdir)/uuidgen.1.in 
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 
++	$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 
+ 
+ blkid.1: $(DEP_SUBSTITUTE) $(srcdir)/blkid.1.in 
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 
++	$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 
+ 
+ filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in
+-	@echo "	SUBST $@"
+-	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
++	$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
+ 
+ installdirs:
+ 	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
+@@ -275,23 +231,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+ 		echo "	INSTALL $(sbindir)/$$i"; \
+ 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
+ 	done
+-	@echo "	LINK $(root_sbindir)/mkfs.ext2"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext2
+-	@echo "	LINK $(root_sbindir)/mkfs.ext3"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext3
+-	@echo "	LINK $(root_sbindir)/mkfs.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext4
+-	@echo "	LINK $(root_sbindir)/mkfs.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
+-	@echo "	LINK $(root_sbindir)/e2label"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ 		$(DESTDIR)$(root_sbindir)/e2label
+-	@echo "	LINK $(root_sbindir)/findfs"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++	$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ 		$(DESTDIR)$(root_sbindir)/findfs
+ 	@for i in $(UPROGS); do \
+ 		echo "	INSTALL $(bindir)/$$i"; \
+@@ -310,17 +260,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+ 	done
+ 	@$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
+-	@echo "	LINK mkfs.ext2.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext2.8
+-	@echo "	LINK mkfs.ext3.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext3.8
+-	@echo "	LINK mkfs.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext4.8
+-	@echo "	LINK mkfs.ext4dev.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
+ 	@for i in $(UMANPAGES); do \
+ 		for j in $(COMPRESS_EXT); do \
diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index 8fe72e5..466ed3f 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jul 16 14:41:45 CEST 2008 - mkoenig@suse.de
+
+- update to version 1.41.0
+  * add support for ext4 filesystem features:
+    extents, uninit_bg, flex_bg, huge_file, dir_nlink
+  * support for checking journal checksums
+  * tune2fs supports migrating fs from 128 byte inode to 256 byte 
+  * add support for "undo"
+  * e2fsck now performs more extensive and careful checks of extended
+    attributes stored in the inod
+- fix e2fsck make check
+
 -------------------------------------------------------------------
 Wed Jul  2 20:21:49 CEST 2008 - schwab@suse.de
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 8f75550..fb04f4f 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package e2fsprogs (Version 1.40.11)
+# spec file for package e2fsprogs (Version 1.41.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -19,8 +19,8 @@ Group:          System/Filesystems
 Supplements:    filesystem(ext2) filesystem(ext3)
 PreReq:         %install_info_prereq
 AutoReqProv:    on
-Version:        1.40.11
-Release:        4
+Version:        1.41.0
+Release:        1
 Summary:        Utilities for the Second Extended File System
 Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
@@ -34,6 +34,7 @@ Patch1:         e2fsprogs-mdraid.patch
 Patch2:         e2fsprogs-base_devt.patch
 Patch3:         e2fsprogs-libvolume_id-support.patch
 Patch5:         e2fsprogs-1.40.4-uuidd_pid_path.patch
+Patch6:         e2fsprogs-1.41.0-tst_link_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
@@ -236,6 +237,7 @@ Authors:
 %patch2 -p1
 %patch3 -p0
 %patch5 -p1
+%patch6 -p1
 # libcom_err patches
 %patch31 -p1 
 %patch32 -p1
@@ -256,7 +258,7 @@ cp %{SOURCE2} .
 	--libdir=%{_libdir} \
 	--enable-elf-shlibs \
 	--disable-evms \
-	CFLAGS="$RPM_OPT_FLAGS"
+        CFLAGS="$RPM_OPT_FLAGS"
 make
 
 %install
@@ -337,14 +339,19 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/badblocks
 /sbin/debugfs
 /sbin/dumpe2fs
+/sbin/e2undo
 /sbin/e2fsck
 /sbin/e2label
 /sbin/fsck
 /sbin/fsck.ext2
 /sbin/fsck.ext3
+/sbin/fsck.ext4
+/sbin/fsck.ext4dev
 /sbin/mke2fs
 /sbin/mkfs.ext2
 /sbin/mkfs.ext3
+/sbin/mkfs.ext4
+/sbin/mkfs.ext4dev
 /sbin/resize2fs
 /sbin/tune2fs
 /sbin/e2image
@@ -441,6 +448,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/com_err.3.gz
 
 %changelog
+* Wed Jul 16 2008 mkoenig@suse.de
+- update to version 1.41.0
+  * add support for ext4 filesystem features:
+  extents, uninit_bg, flex_bg, huge_file, dir_nlink
+  * support for checking journal checksums
+  * tune2fs supports migrating fs from 128 byte inode to 256 byte
+  * add support for "undo"
+  * e2fsck now performs more extensive and careful checks of extended
+  attributes stored in the inod
+- fix e2fsck make check
 * Wed Jul 02 2008 schwab@suse.de
 - Remove doubleplusungood -fsigned-char.
 * Tue Jun 24 2008 mkoenig@suse.de