diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 25e4fb98082f..dade60f164e3 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	taskwarrior
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
-MASTER_SITES=	https://taskwarrior.org/download/
-DISTNAME=	task-${PORTVERSION}
-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Feature-rich command-line todo list manager
 
@@ -19,6 +17,12 @@ TEST_DEPENDS=	faketime:devel/libfaketime
 
 USES=		compiler:c++11-lib cmake python:test shebangfix
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	GothenburgBitFactory
+GH_PROJECT=	taskwarrior libshared:libshared
+GH_TAGNAME=	418a187:libshared
+GH_SUBDIR=	src/libshared:libshared
+
 CMAKE_ARGS+=	-DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \
 		-DTASK_MAN1DIR:STRING=man/man1 \
 		-DTASK_MAN5DIR:STRING=man/man5
@@ -28,6 +32,7 @@ SHEBANG_FILES=	scripts/*/*.pl \
 
 do-test:
 	@cd ${WRKSRC}/test && \
+	${SETENV} TASK_USE_PATH=1 PATH=${PATH}:${STAGEDIR}/bin \
 	${PYTHON_CMD} run_all --verbose && \
 	${PYTHON_CMD} problems
 
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index d41d486fdf69..fc69ff73e63a 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1608308491
-SHA256 (task-2.5.1.tar.gz) = d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15
-SIZE (task-2.5.1.tar.gz) = 903428
+TIMESTAMP = 1608668963
+SHA256 (GothenburgBitFactory-taskwarrior-v2.5.2_GH0.tar.gz) = 4199b035cb939d253fd5db7c7968cb4adbe877d6d00ff894352cc99178ebfa6e
+SIZE (GothenburgBitFactory-taskwarrior-v2.5.2_GH0.tar.gz) = 1292530
+SHA256 (GothenburgBitFactory-libshared-418a187_GH0.tar.gz) = 279e7b7a2b9c910df27ee91c53799ca92add34221dead78b6d7147b4ad7af2c8
+SIZE (GothenburgBitFactory-libshared-418a187_GH0.tar.gz) = 149891
diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist
index a7c924a99ea9..90aec2244330 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -18,7 +18,6 @@ man/man5/taskrc.5.gz
 %%DATADIR%%/rc/dark-red-256.theme
 %%DATADIR%%/rc/dark-violets-256.theme
 %%DATADIR%%/rc/dark-yellow-green.theme
-%%DATADIR%%/rc/holidays.be-BY.rc
 %%DATADIR%%/rc/holidays.cs-CZ.rc
 %%DATADIR%%/rc/holidays.da-DK.rc
 %%DATADIR%%/rc/holidays.de-AT.rc
@@ -26,38 +25,24 @@ man/man5/taskrc.5.gz
 %%DATADIR%%/rc/holidays.de-CH.rc
 %%DATADIR%%/rc/holidays.de-DE.rc
 %%DATADIR%%/rc/holidays.el-GR.rc
-%%DATADIR%%/rc/holidays.en-AU.rc
 %%DATADIR%%/rc/holidays.en-CA.rc
 %%DATADIR%%/rc/holidays.en-GB.rc
-%%DATADIR%%/rc/holidays.en-GL.rc
-%%DATADIR%%/rc/holidays.en-HK.rc
-%%DATADIR%%/rc/holidays.en-IN.rc
 %%DATADIR%%/rc/holidays.en-NZ.rc
 %%DATADIR%%/rc/holidays.en-US.rc
-%%DATADIR%%/rc/holidays.en-ZA.rc
 %%DATADIR%%/rc/holidays.es-CO.rc
-%%DATADIR%%/rc/holidays.es-EC.rc
 %%DATADIR%%/rc/holidays.es-ES.rc
-%%DATADIR%%/rc/holidays.es-MX.rc
 %%DATADIR%%/rc/holidays.es-US.rc
-%%DATADIR%%/rc/holidays.et-EE.rc
 %%DATADIR%%/rc/holidays.fi-FI.rc
 %%DATADIR%%/rc/holidays.fr-BE.rc
 %%DATADIR%%/rc/holidays.fr-FR.rc
-%%DATADIR%%/rc/holidays.ga-IE.rc
 %%DATADIR%%/rc/holidays.hr-HR.rc
 %%DATADIR%%/rc/holidays.is-IS.rc
 %%DATADIR%%/rc/holidays.it-IT.rc
-%%DATADIR%%/rc/holidays.jp-JP.rc
-%%DATADIR%%/rc/holidays.lt-LT.rc
-%%DATADIR%%/rc/holidays.lv-LV.rc
 %%DATADIR%%/rc/holidays.nb-NO.rc
-%%DATADIR%%/rc/holidays.nb-SJ.rc
 %%DATADIR%%/rc/holidays.nl-BE.rc
 %%DATADIR%%/rc/holidays.nl-NL.rc
 %%DATADIR%%/rc/holidays.pl-PL.rc
 %%DATADIR%%/rc/holidays.por-PRT.rc
-%%DATADIR%%/rc/holidays.pt-BR.rc
 %%DATADIR%%/rc/holidays.pt-PT.rc
 %%DATADIR%%/rc/holidays.ru-RU.rc
 %%DATADIR%%/rc/holidays.sv-SE.rc
@@ -71,7 +56,6 @@ man/man5/taskrc.5.gz
 %%DATADIR%%/README.md
 %%DATADIR%%/scripts/add-ons/README
 %%DATADIR%%/scripts/add-ons/update-holidays.pl
-%%DATADIR%%/scripts/bash/task_functions.sh
 %%DATADIR%%/scripts/bash/task.sh
 %%DATADIR%%/scripts/fish/task.fish
 %%DATADIR%%/scripts/hooks/on-add