diff --git a/deskutils/calcurse/Makefile b/deskutils/calcurse/Makefile
index 90a1dd142936..00939aa18a74 100644
--- a/deskutils/calcurse/Makefile
+++ b/deskutils/calcurse/Makefile
@@ -3,9 +3,10 @@
 # Whom:                                 Herbert J. Skuhra <h.skuhra@gmail.com>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	calcurse
-PORTVERSION=	2.9.2
+PORTVERSION=	3.0.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://calcurse.org/files/ \
 		ftp://ftp2.culot.org/culot/
@@ -15,35 +16,36 @@ COMMENT=	A text-based calendar and scheduling application
 
 LICENSE=	BSD
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+OPTIONS_DEFINE=	DOCS NLS
 
-CONFIGURE_ARGS+=	--without-asciidoc
+CONFIGURE_ARGS=	--without-asciidoc
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 MAN1=		calcurse.1
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
+.include <bsd.port.options.mk>
 
-post-patch:
-.if !defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e \
-		's|^docdir = .*|docdir = ${DOCSDIR}|' \
-		${WRKSRC}/doc/Makefile.in
-.else
+.if empty(PORT_OPTIONS:MDOCS)
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-patch:
+.if ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${DOCSDIR}|' ${WRKSRC}/doc/Makefile.in
+.endif
+
 post-install:
-.if defined(NOPORTDOCS)
-.for file in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/doc/${file} ${MANPREFIX}/man/man1
-.endfor
+.if empty(PORT_OPTIONS:MDOCS)
+	cd ${WRKSRC}/doc/ && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1/
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/calcurse/distinfo b/deskutils/calcurse/distinfo
index e8611aae302f..113944d5e020 100644
--- a/deskutils/calcurse/distinfo
+++ b/deskutils/calcurse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calcurse-2.9.2.tar.gz) = e116c52fb82a051b38950bdbdb3f9df99fce2713c64d3eda1de236bacba28a55
-SIZE (calcurse-2.9.2.tar.gz) = 517071
+SHA256 (calcurse-3.0.0.tar.gz) = 8a633120a8da250bce11d746a98c9aac3309235a3acdf19d001ab36e62cacdfa
+SIZE (calcurse-3.0.0.tar.gz) = 682545
diff --git a/deskutils/calcurse/pkg-plist b/deskutils/calcurse/pkg-plist
index 3d97e83f7f2d..161f4ffcfac8 100644
--- a/deskutils/calcurse/pkg-plist
+++ b/deskutils/calcurse/pkg-plist
@@ -1,9 +1,12 @@
 bin/calcurse
+bin/calcurse-upgrade
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/submitting-patches.html
 %%NLS%%share/locale/de/LC_MESSAGES/calcurse.mo
 %%NLS%%share/locale/en/LC_MESSAGES/calcurse.mo
 %%NLS%%share/locale/es/LC_MESSAGES/calcurse.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/calcurse.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/calcurse.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/calcurse.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/calcurse.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%