diff --git a/deskutils/calcurse/Makefile b/deskutils/calcurse/Makefile
index 7164106fa95b..f83eeceffcd3 100644
--- a/deskutils/calcurse/Makefile
+++ b/deskutils/calcurse/Makefile
@@ -1,43 +1,47 @@
 # Created by: Herbert J. Skuhra <h.skuhra@gmail.com>
 
 PORTNAME=	calcurse
-PORTVERSION=	4.5.1
+DISTVERSION=	4.7.1
 CATEGORIES=	deskutils
-MASTER_SITES=	https://calcurse.org/files/
+MASTER_SITES=	https://calcurse.org/files/ \
+		https://fossies.org/linux/privat/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-based calendar and scheduling application
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	CALDAV DOCS NLS
-OPTIONS_DEFAULT=CALDAV
-OPTIONS_SUB=	yes
-
-USES=		gmake ncurses shebangfix
+USES=		ncurses shebangfix
 SHEBANG_FILES=	contrib/caldav/calcurse-caldav \
 		contrib/caldav/calcurse-caldav.py \
 		contrib/vdir/calcurse-vdir \
 		contrib/vdir/calcurse-vdir.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-asciidoc
 
-DOCS_CONFIGURE_ENABLE=	docs
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext
+OPTIONS_DEFINE=	CALDAV DOCS NLS
+OPTIONS_DEFAULT=CALDAV
+OPTIONS_SUB=	yes
 
-CALDAV_DESC=		Support Calendaring Extensions to WebDAV
-CALDAV_USES=		python:3.4+
-CALDAV_USES_OFF=	python:3.4+,env
+CALDAV_DESC=	Support Calendaring Extensions to WebDAV
+
+CALDAV_USES=		python:3.6+
+CALDAV_USES_OFF=	python:3.6+,env
 CALDAV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}oauth2client>=0:security/py-oauth2client@${PY_FLAVOR}
 
+DOCS_USES=		gmake
+DOCS_CONFIGURE_ENABLE=	docs
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${DOCSDIR}|' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's|-R$$found_dir||' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1
 
 .include <bsd.port.mk>
diff --git a/deskutils/calcurse/distinfo b/deskutils/calcurse/distinfo
index 6784fddb0960..583f953affc4 100644
--- a/deskutils/calcurse/distinfo
+++ b/deskutils/calcurse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578313699
-SHA256 (calcurse-4.5.1.tar.gz) = 5336576824cba7d40eee0b33213992b4304368972ef556a930f3965e9068f331
-SIZE (calcurse-4.5.1.tar.gz) = 659272
+TIMESTAMP = 1618390930
+SHA256 (calcurse-4.7.1.tar.gz) = 0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0
+SIZE (calcurse-4.7.1.tar.gz) = 701563