diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/emma/ports/sysutils/e2fsprogs/Makefile
--- /usr/ports/sysutils/e2fsprogs/Makefile	2008-03-06 20:30:15.000000000 +0100
+++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile	2008-03-27 12:34:39.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.40.7
+PORTVERSION=	1.40.8
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -51,12 +51,6 @@
 PLIST_SUB=	NLS="@comment "
 .else
 USE_GETTEXT=	yes
-# We need to make sure that anything that is outside the root file
-# system is statically linked, else we're in trouble if e2fsck is needed
-# for boot:
-MAKE_ARGS+=	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
-		../lib/libblkid.a  ../lib/libuuid.a" \
-		LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
 PLIST_SUB=	NLS=""
 .endif
 
@@ -69,7 +63,16 @@
 
 .if ${MASTERDIR} == ${.CURDIR}
 post-build:
-# Avoid a regression from 1.40.5,
+# Relink e2fsck statically - We need to make sure that tools for the root file
+# system are statically linked against anything that is outside the root fs,
+# else we're in trouble if e2fsck is needed for boot:
+# (we don't use e2fsck.static, since we can link libc.so dynamically)
+	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
+		&& ${MAKE} e2fsck \
+		STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
+		../lib/libblkid.a  ../lib/libuuid.a" \
+		LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
+# Regression check: avoid a port (not upstream!) regression from 1.40.5,
 # check that e2fsck isn't dynalinked against anything but libc.so:
 	@${ECHO_CMD} -n "===>  checking that e2fsck depends on no shared objects beyond libc.so: "
 	@a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/emma/ports/sysutils/e2fsprogs/distinfo
--- /usr/ports/sysutils/e2fsprogs/distinfo	2008-03-06 20:30:15.000000000 +0100
+++ /usr/home/emma/ports/sysutils/e2fsprogs/distinfo	2008-03-27 11:54:44.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (e2fsprogs-1.40.7.tar.gz) = e24f9d517a2d7ba3cff29337ae73c10a
-SHA256 (e2fsprogs-1.40.7.tar.gz) = 59765723709db286abbaf6418a06b047455919593959d219b5c29ddf72ff2c05
-SIZE (e2fsprogs-1.40.7.tar.gz) = 4087067
+MD5 (e2fsprogs-1.40.8.tar.gz) = 450e2fb2461b2296fec770ff8fc147ed
+SHA256 (e2fsprogs-1.40.8.tar.gz) = 38df70f8b5ba121b11b02101cc399306a199d3c66c8185d8a2c0d07f5688eead
+SIZE (e2fsprogs-1.40.8.tar.gz) = 4102707