diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 9dab8c50b40..7b2a860a7b9 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.31 2014/04/22 10:21:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2014/04/30 11:40:04 ajacoutot Exp $
 
 COMMENT=	utilities to manipulate ext2 filesystems
 
-DISTNAME=	e2fsprogs-1.42.7
-REVISION =	1
+DISTNAME=	e2fsprogs-1.42.9
 CATEGORIES=	sysutils devel
 SHARED_LIBS=	blkid		0.0 \
 		com_err		21.0 \
 		e2p		3.1 \
-		ext2fs		3.1 \
+		ext2fs		4.0 \
 		ss		3.1 \
 		uuid		14.0
 
@@ -27,10 +26,11 @@ SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.69
 CONFIGURE_ARGS+= --enable-elf-shlibs --disable-tls
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -D_EXT2_USE_C_VERSIONS_"
+CONFIGURE_ENV=	CPPFLAGS="-D_EXT2_USE_C_VERSIONS_"
 USE_GMAKE=	Yes
 
 MAKE_FLAGS=	V=1 \
+		LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \
 		LIBblkid_VERSION=${LIBblkid_VERSION} \
 		LIBcom_err_VERSION=${LIBcom_err_VERSION} \
 		LIBe2p_VERSION=${LIBe2p_VERSION} \
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 1e4cdae5898..f020203211a 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2fsprogs-1.42.7.tar.gz) = 3GUBsuddIF5CUZbXU9krEpxWhSXYqtCAhcCqae6ec0U=
-SIZE (e2fsprogs-1.42.7.tar.gz) = 5981006
+SHA256 (e2fsprogs-1.42.9.tar.gz) = L5KsBukvoA8q2j7mfa0BLXTWhVN1J60SQdgvLQQfKAI=
+SIZE (e2fsprogs-1.42.9.tar.gz) = 6069173
diff --git a/sysutils/e2fsprogs/patches/patch-doc_Makefile_in b/sysutils/e2fsprogs/patches/patch-doc_Makefile_in
index d784ddd2ce2..cb9ae719e8a 100644
--- a/sysutils/e2fsprogs/patches/patch-doc_Makefile_in
+++ b/sysutils/e2fsprogs/patches/patch-doc_Makefile_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.3 2013/06/21 22:35:51 sthen Exp $
---- doc/Makefile.in.orig	Tue Jan  8 16:00:07 2013
-+++ doc/Makefile.in	Wed Jun 19 14:25:06 2013
+$OpenBSD: patch-doc_Makefile_in,v 1.4 2014/04/30 11:40:04 ajacoutot Exp $
+--- doc/Makefile.in.orig	Sun Dec 29 05:18:02 2013
++++ doc/Makefile.in	Wed Apr 30 10:36:56 2014
 @@ -17,9 +17,9 @@ INFO=@MAKEINFO@
- HTML=texi2html -split_chapter
+ HTML=makeinfo --html --no-split
  PS2PDF=ps2pdf
  
--all:: libext2fs.info libext2fs.dvi
+-all:: libext2fs.info libext2fs.dvi libext2fs.html
 +all:: libext2fs.info
  
 -install-doc-libs: libext2fs.info libext2fs.dvi
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_kernel-list_h b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_kernel-list_h
deleted file mode 100644
index 81bbf47c134..00000000000
--- a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_kernel-list_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_ext2fs_kernel-list_h,v 1.1 2013/06/21 22:35:51 sthen Exp $
-
-Conflict with queue.h
-
---- lib/ext2fs/kernel-list.h.orig	Fri Jul  6 14:37:27 2012
-+++ lib/ext2fs/kernel-list.h	Wed Jun 19 14:25:04 2013
-@@ -17,6 +17,7 @@ struct list_head {
- 
- #define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
-+#undef LIST_HEAD
- #define LIST_HEAD(name) \
- 	struct list_head name = { &name, &name }
- 
diff --git a/sysutils/e2fsprogs/pkg/PLIST b/sysutils/e2fsprogs/pkg/PLIST
index f96cc72fe72..db688fd7c8b 100644
--- a/sysutils/e2fsprogs/pkg/PLIST
+++ b/sysutils/e2fsprogs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2014/04/22 10:21:13 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.14 2014/04/30 11:40:04 ajacoutot Exp $
 @conflict e2fs-uuid-*
 @conflict uuid-*
 @conflict ossp-uuid-<1.6.2p2
@@ -77,6 +77,9 @@ lib/pkgconfig/uuid.pc
 @man man/man3/uuid_time.3
 @man man/man3/uuid_unparse.3
 @man man/man5/e2fsck.conf.5
+@man man/man5/ext2.5
+@man man/man5/ext3.5
+@man man/man5/ext4.5
 @man man/man5/mke2fs.conf.5
 @man man/man8/badblocks.8
 @man man/man8/blkid.8