diff -urN /usr/ports/mail/mu/Makefile mail/mu/Makefile
--- /usr/ports/mail/mu/Makefile	2015-08-24 03:59:55.820199000 +0900
+++ mail/mu/Makefile	2015-11-01 00:00:00.000000000 +0900
@@ -2,9 +2,9 @@
 # $FreeBSD: head/mail/mu/Makefile 393975 2015-08-11 21:55:42Z pawel $
 
 PORTNAME=	mu
-PORTVERSION=	0.9.12
-DISTVERSIONPREFIX=	v
+PORTVERSION=	0.9.15
 CATEGORIES=	mail
+MASTER_SITES=	GH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
@@ -26,7 +26,7 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		GUILE MU4E
+OPTIONS_DEFINE=		DOCS GUILE MU4E
 OPTIONS_SUB=		yes
 
 GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
@@ -38,14 +38,12 @@
 MU4E_CONFIGURE_ENABLE=	mu4e
 MU4E_INFO=		mu4e
 
-.include <bsd.port.options.mk>
-
 post-install:
 	(cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
 		${STAGEDIR}${PREFIX}/bin)
-.if ${PORT_OPTIONS:MGUILE}
+
+post-install-GUILE-on:
 	(${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
 		${XARGS} ${STRIP_CMD})
-.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/mail/mu/distinfo mail/mu/distinfo
--- /usr/ports/mail/mu/distinfo	2015-08-24 03:59:55.835191000 +0900
+++ mail/mu/distinfo	2015-11-01 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (djcb-mu-v0.9.12_GH0.tar.gz) = b871124fc7774a2593815f89286671a8f31d7243bb898a8ca454685599f2b9af
-SIZE (djcb-mu-v0.9.12_GH0.tar.gz) = 2196977
+SHA256 (djcb-mu-0.9.15_GH0.tar.gz) = 60c63fdf1b726696cb0028b86eaee2aa72e171493b2d5626ea173b912ff25d4c
+SIZE (djcb-mu-0.9.15_GH0.tar.gz) = 2203193
diff -urN /usr/ports/mail/mu/pkg-plist mail/mu/pkg-plist
--- /usr/ports/mail/mu/pkg-plist	2015-08-24 03:59:55.812989000 +0900
+++ mail/mu/pkg-plist	2015-11-01 00:00:00.000000000 +0900
@@ -20,8 +20,8 @@
 man/man1/mu.1.gz
 man/man1/mug.1.gz
 man/man5/mu-bookmarks.5.gz
-%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-about.el
-%%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-about.elc
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.org
+%%PORTDOCS%%%%MU4E%%%%DOCSDIR%%/mu4e-about.org
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.el
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
 %%MU4E%%%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el