diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile
index f31184d78270..40f8f4fa983a 100644
--- a/www/kompozer/Makefile
+++ b/www/kompozer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvu
-PORTVERSION=	0.80
+PORTVERSION=	0.81
 CATEGORIES=	www
 MASTER_SITES=	http://cvs.nvu.com/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-sources
@@ -34,7 +34,7 @@ OPTIONS=	XFT "Enable Xft font anti-aliasing" on \
 		DEBUG "Enable debugging (i.e. gdb) support" off \
 		OPTIMIZED_CFLAGS "Enable -O2 optimizations" off
 
-NVU=		nvu-0.80
+NVU=		${PORTNAME}-${PORTVERSION}
 FAKEDIR=	${WRKDIR}/FAKE
 WRKSRC=		${WRKDIR}/mozilla
 PLIST=		${WRKDIR}/plist
@@ -93,7 +93,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/configure \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
diff --git a/www/kompozer/distinfo b/www/kompozer/distinfo
index 393243a44832..c6bc653657f9 100644
--- a/www/kompozer/distinfo
+++ b/www/kompozer/distinfo
@@ -1,2 +1,2 @@
-MD5 (nvu-0.80-sources.tar.bz2) = 9f705df4c8742ff11914fadce982b6b8
-SIZE (nvu-0.80-sources.tar.bz2) = 32659280
+MD5 (nvu-0.81-sources.tar.bz2) = 7287dca818596df8f58031af7819c330
+SIZE (nvu-0.81-sources.tar.bz2) = 29706074
diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index f31184d78270..40f8f4fa983a 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvu
-PORTVERSION=	0.80
+PORTVERSION=	0.81
 CATEGORIES=	www
 MASTER_SITES=	http://cvs.nvu.com/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-sources
@@ -34,7 +34,7 @@ OPTIONS=	XFT "Enable Xft font anti-aliasing" on \
 		DEBUG "Enable debugging (i.e. gdb) support" off \
 		OPTIMIZED_CFLAGS "Enable -O2 optimizations" off
 
-NVU=		nvu-0.80
+NVU=		${PORTNAME}-${PORTVERSION}
 FAKEDIR=	${WRKDIR}/FAKE
 WRKSRC=		${WRKDIR}/mozilla
 PLIST=		${WRKDIR}/plist
@@ -93,7 +93,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/configure \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
diff --git a/www/nvu/distinfo b/www/nvu/distinfo
index 393243a44832..c6bc653657f9 100644
--- a/www/nvu/distinfo
+++ b/www/nvu/distinfo
@@ -1,2 +1,2 @@
-MD5 (nvu-0.80-sources.tar.bz2) = 9f705df4c8742ff11914fadce982b6b8
-SIZE (nvu-0.80-sources.tar.bz2) = 32659280
+MD5 (nvu-0.81-sources.tar.bz2) = 7287dca818596df8f58031af7819c330
+SIZE (nvu-0.81-sources.tar.bz2) = 29706074