diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index a1faa126ae16..9127b4065aea 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -1,38 +1,39 @@
 # Created by: gahr
 
 PORTNAME=	taskwarrior
-PORTVERSION=	2.5.3
+PORTVERSION=	2.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Feature-rich command-line todo list manager
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgnutls.so:security/gnutls
 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_TAGNAME=	8baf2db:libshared
 GH_SUBDIR=	src/libshared:libshared
 
 CMAKE_ARGS+=	-DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \
 		-DTASK_MAN1DIR:STRING=man/man1 \
-		-DTASK_MAN5DIR:STRING=man/man5
+		-DTASK_MAN5DIR:STRING=man/man5 \
+		-DCMAKE_BUILD_TYPE=release
 
 SHEBANG_FILES=	scripts/*/*.pl \
 		doc/rc/refresh \
 
 do-test:
 	@cd ${WRKSRC}/test && \
 	${SETENV} TASK_USE_PATH=1 PATH=${PATH}:${STAGEDIR}/bin \
 	${PYTHON_CMD} run_all --verbose && \
 	${PYTHON_CMD} problems
 
 .include <bsd.port.mk>
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index f12fb035c222..b436938593ac 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1614095986
-SHA256 (GothenburgBitFactory-taskwarrior-v2.5.3_GH0.tar.gz) = 6bc876578ff4313cd6412596b33fb7533a4e766f66920d0bbd713353d5b8d38a
-SIZE (GothenburgBitFactory-taskwarrior-v2.5.3_GH0.tar.gz) = 1292564
-SHA256 (GothenburgBitFactory-libshared-418a187_GH0.tar.gz) = 279e7b7a2b9c910df27ee91c53799ca92add34221dead78b6d7147b4ad7af2c8
-SIZE (GothenburgBitFactory-libshared-418a187_GH0.tar.gz) = 149891
+TIMESTAMP = 1634927357
+SHA256 (GothenburgBitFactory-taskwarrior-v2.6.1_GH0.tar.gz) = 5369a1fa706b8f4126d6dbe24b00b6e5f921296bc30cd088270544da9817d4ab
+SIZE (GothenburgBitFactory-taskwarrior-v2.6.1_GH0.tar.gz) = 1343146
+SHA256 (GothenburgBitFactory-libshared-8baf2db_GH0.tar.gz) = c93a30bf53a0751f10cc137c42bd05f1fa47477f2803ae45d684a14202238b63
+SIZE (GothenburgBitFactory-libshared-8baf2db_GH0.tar.gz) = 161275
diff --git a/deskutils/taskwarrior/files/patch-CMakeLists.txt b/deskutils/taskwarrior/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..dada2d267657
--- /dev/null
+++ b/deskutils/taskwarrior/files/patch-CMakeLists.txt
@@ -0,0 +1,21 @@
+--- CMakeLists.txt.orig	2021-10-22 18:31:30 UTC
++++ CMakeLists.txt
+@@ -165,18 +165,6 @@ foreach (doc_FILE ${doc_FILES})
+   install (FILES ${doc_FILE}  DESTINATION ${TASK_DOCDIR})
+ endforeach (doc_FILE)
+ 
+-add_custom_command(OUTPUT run-review
+-    COMMAND docker build -q --build-arg PR=$(PR) --build-arg LIBPR=$(LIBPR) -t taskwarrior-review:$(PR)s$(LIBPR) - < scripts/review-dockerfile
+-    COMMAND docker run --rm --memory 1g --hostname pr-$(PR)s$(LIBPR) -it taskwarrior-review:$(PR)s$(LIBPR) bash || :
+-)
+-add_custom_target(review DEPENDS run-review)
+-
+-add_custom_command(OUTPUT run-reproduce
+-    COMMAND docker build -q --build-arg RELEASE=$(RELEASE) -t taskwarrior-reproduce:$(RELEASE) - < scripts/reproduce-dockerfile
+-    COMMAND docker run --rm --memory 1g --hostname tw-$(RELEASE) -it taskwarrior-reproduce:$(RELEASE) bash || :
+-)
+-add_custom_target(reproduce DEPENDS run-reproduce)
+-
+ # ---
+ 
+ set (CPACK_SOURCE_GENERATOR "TGZ")
diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist
index 90aec2244330..228e4a7a0a75 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -1,74 +1,79 @@
 bin/task
 man/man1/task.1.gz
 man/man5/task-color.5.gz
 man/man5/task-sync.5.gz
 man/man5/taskrc.5.gz
 %%DATADIR%%/AUTHORS
-%%DATADIR%%/ChangeLog
 %%DATADIR%%/COPYING
+%%DATADIR%%/ChangeLog
 %%DATADIR%%/INSTALL
 %%DATADIR%%/LICENSE
 %%DATADIR%%/NEWS
+%%DATADIR%%/README.md
 %%DATADIR%%/rc/dark-16.theme
 %%DATADIR%%/rc/dark-256.theme
 %%DATADIR%%/rc/dark-blue-256.theme
 %%DATADIR%%/rc/dark-gray-256.theme
 %%DATADIR%%/rc/dark-gray-blue-256.theme
 %%DATADIR%%/rc/dark-green-256.theme
 %%DATADIR%%/rc/dark-red-256.theme
 %%DATADIR%%/rc/dark-violets-256.theme
 %%DATADIR%%/rc/dark-yellow-green.theme
 %%DATADIR%%/rc/holidays.cs-CZ.rc
 %%DATADIR%%/rc/holidays.da-DK.rc
 %%DATADIR%%/rc/holidays.de-AT.rc
 %%DATADIR%%/rc/holidays.de-BE.rc
 %%DATADIR%%/rc/holidays.de-CH.rc
 %%DATADIR%%/rc/holidays.de-DE.rc
 %%DATADIR%%/rc/holidays.el-GR.rc
 %%DATADIR%%/rc/holidays.en-CA.rc
 %%DATADIR%%/rc/holidays.en-GB.rc
 %%DATADIR%%/rc/holidays.en-NZ.rc
 %%DATADIR%%/rc/holidays.en-US.rc
 %%DATADIR%%/rc/holidays.es-CO.rc
 %%DATADIR%%/rc/holidays.es-ES.rc
 %%DATADIR%%/rc/holidays.es-US.rc
 %%DATADIR%%/rc/holidays.fi-FI.rc
 %%DATADIR%%/rc/holidays.fr-BE.rc
+%%DATADIR%%/rc/holidays.fr-CA.rc
 %%DATADIR%%/rc/holidays.fr-FR.rc
 %%DATADIR%%/rc/holidays.hr-HR.rc
+%%DATADIR%%/rc/holidays.hu-HU.rc
 %%DATADIR%%/rc/holidays.is-IS.rc
 %%DATADIR%%/rc/holidays.it-IT.rc
 %%DATADIR%%/rc/holidays.nb-NO.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.sk-SK.rc
+%%DATADIR%%/rc/holidays.sv-FI.rc
 %%DATADIR%%/rc/holidays.sv-SE.rc
 %%DATADIR%%/rc/holidays.tr-TR.rc
 %%DATADIR%%/rc/light-16.theme
 %%DATADIR%%/rc/light-256.theme
 %%DATADIR%%/rc/no-color.theme
 %%DATADIR%%/rc/refresh
 %%DATADIR%%/rc/solarized-dark-256.theme
 %%DATADIR%%/rc/solarized-light-256.theme
-%%DATADIR%%/README.md
 %%DATADIR%%/scripts/add-ons/README
 %%DATADIR%%/scripts/add-ons/update-holidays.pl
 %%DATADIR%%/scripts/bash/task.sh
 %%DATADIR%%/scripts/fish/task.fish
+%%DATADIR%%/scripts/hooks/README
 %%DATADIR%%/scripts/hooks/on-add
 %%DATADIR%%/scripts/hooks/on-add.the
 %%DATADIR%%/scripts/hooks/on-exit
 %%DATADIR%%/scripts/hooks/on-exit.shadow-file
 %%DATADIR%%/scripts/hooks/on-launch
 %%DATADIR%%/scripts/hooks/on-modify
-%%DATADIR%%/scripts/hooks/README
-%%DATADIR%%/scripts/vim/ftdetect/task.vim
 %%DATADIR%%/scripts/vim/README
+%%DATADIR%%/scripts/vim/ftdetect/task.vim
 %%DATADIR%%/scripts/vim/syntax/taskdata.vim
 %%DATADIR%%/scripts/vim/syntax/taskedit.vim
 %%DATADIR%%/scripts/vim/syntax/taskrc.vim
-%%DATADIR%%/scripts/zsh/_task
 %%DATADIR%%/task-ref.pdf
+share/zsh/site-functions/_task