diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index fbbb502bba1a..7e29b5b868af 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imapfilter
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.5
 CATEGORIES=	mail
 MASTER_SITES=	http://imapfilter.hellug.gr/source/
 
@@ -14,21 +14,19 @@ MAINTAINER=	lefcha@hellug.gr
 COMMENT=	IMAP mail filtering utility
 
 USE_BZIP2=	yes
-
 USE_OPENSSL=	yes
 
 MAN1=		imapfilter.1
 MAN5=		imapfilterrc.5
+DOCS=		LICENSE NEWS README
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/imapfilter
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
-	${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample.imapfilterrc ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index 5abfbeb8110c..a844a993b05f 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1 +1 @@
-MD5 (imapfilter-0.9.4.tar.bz2) = 3ea63d41a3c2f786982e4e86cccd3ede
+MD5 (imapfilter-0.9.5.tar.bz2) = 4593e3422d75d9cb2e498fe353c0fedc
diff --git a/mail/imapfilter/pkg-plist b/mail/imapfilter/pkg-plist
index 6341ab3d11e3..3fa9303315ff 100644
--- a/mail/imapfilter/pkg-plist
+++ b/mail/imapfilter/pkg-plist
@@ -1,7 +1,8 @@
+@comment $FreeBSD$
 bin/imapfilter
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%EXAMPLESDIR%%/sample.imapfilterrc
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLESDIR%%/sample.imapfilterrc
+@dirrm %%EXAMPLESDIR%%