diff --git a/devel/libuninum/Makefile b/devel/libuninum/Makefile
index fc5f197e99e4..2a025a809960 100644
--- a/devel/libuninum/Makefile
+++ b/devel/libuninum/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libuninum
 PORTVERSION=	2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
@@ -13,8 +13,10 @@ COMMENT=	Library for converting Unicode strings to numbers
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 GNU_CONFIGURE=	yes
-MAKE_ENV+=	INCLUDES="-I${LOCALBASE}/include"
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+USES=		libtool
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/devel/libuninum/files/patch-ltmain.sh b/devel/libuninum/files/patch-ltmain.sh
deleted file mode 100644
index 8a01c629fef2..000000000000
--- a/devel/libuninum/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Sun Jan 22 03:36:15 2006
-+++ ltmain.sh	Sun Jan  7 22:28:13 2007
-@@ -5995,10 +5995,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libuninum/pkg-plist b/devel/libuninum/pkg-plist
index 20c7b8ce3097..9e4715de1e33 100644
--- a/devel/libuninum/pkg-plist
+++ b/devel/libuninum/pkg-plist
@@ -3,8 +3,9 @@ bin/numconv
 include/uninum/uninum.h
 include/uninum/nsdefs.h
 include/uninum/unicode.h
-lib/libuninum.so.7
-lib/libuninum.so
 lib/libuninum.a
+lib/libuninum.so
+lib/libuninum.so.5
+lib/libuninum.so.5.2.1
 man/man1/numconv.1.gz
 @dirrmtry include/uninum
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index c95c8ab6f9ce..b825fb116f96 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	msort
 PORTVERSION=	8.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/