diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index d28cbf2eef45..bb4d24d2e7ba 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	msort
-PORTVERSION=	8.38
-PORTREVISION=	2
+PORTVERSION=	8.42
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
@@ -16,10 +15,11 @@ COMMENT=	Sorting files in sophisticated ways
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	tre:${PORTSDIR}/textproc/libtre \
-    		uninum:${PORTSDIR}/devel/libuninum
+    		uninum:${PORTSDIR}/devel/libuninum \
+		utf8proc:${PORTSDIR}/textproc/utf8proc
 RUN_DEPENDS=	iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
 MAKE_ENV+=	INCLUDES="-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 USE_TK_RUN=	yes
diff --git a/textproc/msort/distinfo b/textproc/msort/distinfo
index ec8174f66305..6ea33854b752 100644
--- a/textproc/msort/distinfo
+++ b/textproc/msort/distinfo
@@ -1,3 +1,3 @@
-MD5 (msort-8.38.tar.gz) = d36a2810794da25f077dffec3bb30778
-SHA256 (msort-8.38.tar.gz) = aba670926b6dc1c1f4639e2d60fa805c50b2884ad799f623d81b1ae8fa496394
-SIZE (msort-8.38.tar.gz) = 379986
+MD5 (msort-8.42.tar.gz) = eafe317b58a16752fb5dc5d25383d5f4
+SHA256 (msort-8.42.tar.gz) = b05cb15bf02eed01b004b1930a40e13b1b77c21cf8e5d7d5268adc68f040977e
+SIZE (msort-8.42.tar.gz) = 395718
diff --git a/textproc/msort/files/patch-Makefile.in b/textproc/msort/files/patch-Makefile.in
index bcf2d423dfa9..9b30601de843 100644
--- a/textproc/msort/files/patch-Makefile.in
+++ b/textproc/msort/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Mar  5 16:08:46 2007
-+++ Makefile.in	Wed Jul 25 09:26:41 2007
-@@ -120,7 +120,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@ -lgmp
-+LIBS = @LIBS@ -lgmp -lintl
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
- NOCOMPARISONCNT_FALSE = @NOCOMPARISONCNT_FALSE@
+--- Makefile.in.orig	2007-09-03 14:48:29.000000000 +0800
++++ Makefile.in	2007-10-15 10:11:35.000000000 +0800
+@@ -37,7 +37,7 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ bin_PROGRAMS = msort$(EXEEXT)
+-@UNINUMOK_TRUE@am__append_1 = -lgmp -luninum
++@UNINUMOK_TRUE@am__append_1 = -lgmp -luninum -lintl
+ @UTF8PROCOK_TRUE@am__append_2 = -lutf8proc
+ @UTF8PROCOK_TRUE@am__append_3 = -DUSEUTF8PROC
+ @UTF8PROCOK_FALSE@am__append_4 = -licutu