diff --git a/sysutils/ndir/Makefile b/sysutils/ndir/Makefile
index f112a306abc1..cfd3cc99ef65 100644
--- a/sysutils/ndir/Makefile
+++ b/sysutils/ndir/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ndir
-PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTVERSION=	0.8.8
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.Informatik.Uni-Oldenburg.DE/~mw/software/
 DISTNAME=	NDir-${PORTVERSION}
@@ -23,10 +23,12 @@ CFLAGS+=	-DNO_THOUSANDS_GROUPING
 MAN1=		ndir.1
 MLINKS=		ndir.1 lv.1 ndir.1 lw.1
 
+PLIST_FILES=	bin/ndir bin/lw bin/lv
+
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${REINPLACE_CMD} -E "s/^export GLOBAL.+//g" ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|-Wall -O2|${CFLAGS}|g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ndir ${PREFIX}/bin
diff --git a/sysutils/ndir/distinfo b/sysutils/ndir/distinfo
index 99cec7e4db7d..f332368d678e 100644
--- a/sysutils/ndir/distinfo
+++ b/sysutils/ndir/distinfo
@@ -1,2 +1,2 @@
-MD5 (NDir-0.8.7-1.tar.gz) = c9c5b9eef2abb38df04d17f47912c2fa
-SIZE (NDir-0.8.7-1.tar.gz) = 112111
+MD5 (NDir-0.8.8-1.tar.gz) = f6e129ac5b0e80885cf28931d3254f9c
+SIZE (NDir-0.8.8-1.tar.gz) = 124946
diff --git a/sysutils/ndir/files/patch-src-File-Date-StringUtils-Format.h b/sysutils/ndir/files/patch-src-File-Date-StringUtils-Format.h
new file mode 100644
index 000000000000..eb256018e212
--- /dev/null
+++ b/sysutils/ndir/files/patch-src-File-Date-StringUtils-Format.h
@@ -0,0 +1,10 @@
+--- src/File-Date-StringUtils/Format.h.orig	Sat Apr 10 01:41:38 2004
++++ src/File-Date-StringUtils/Format.h	Mon Sep 26 16:09:59 2005
+@@ -65,6 +65,6 @@
+     text-containing string to be output on a terminal 
+    */
+   std::string clean( std::string s);
+-
++  std::string getLengthString( int length);
+ 
+ #endif
diff --git a/sysutils/ndir/pkg-plist b/sysutils/ndir/pkg-plist
deleted file mode 100644
index 504e05a2ca20..000000000000
--- a/sysutils/ndir/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/ndir
-bin/lv
-bin/lw