diff --git a/app-misc/task/patches/task-2.6.0~git-source2.patchset b/app-misc/task/patches/task-2.6.0~git-source2.patchset
new file mode 100644
index 000000000..6b5b32495
--- /dev/null
+++ b/app-misc/task/patches/task-2.6.0~git-source2.patchset
@@ -0,0 +1,21 @@
+From 8577dac034b1b8cd7dc29bbad7f18816c4503f95 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Tue, 11 May 2021 19:03:03 +0000
+Subject: Fix undeclared timegm
+
+
+diff --git a/libshared-9a5f24e2acb38d05afb8f8e316a966dee196a42a/src/Datetime.cpp b/libshared-9a5f24e2acb38d05afb8f8e316a966dee196a42a/src/Datetime.cpp
+index c9f2a0b..18d15f4 100644
+--- a/libshared-9a5f24e2acb38d05afb8f8e316a966dee196a42a/src/Datetime.cpp
++++ b/libshared-9a5f24e2acb38d05afb8f8e316a966dee196a42a/src/Datetime.cpp
+@@ -24,6 +24,7 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
++#define _DEFAULT_SOURCE
+ #include <cmake.h>
+ #include <Datetime.h>
+ #include <algorithm>
+-- 
+2.30.2
+
diff --git a/app-misc/task/patches/task-2.6.0~git.patchset b/app-misc/task/patches/task-2.6.0~git.patchset
new file mode 100644
index 000000000..d13469e41
--- /dev/null
+++ b/app-misc/task/patches/task-2.6.0~git.patchset
@@ -0,0 +1,54 @@
+From b8e5cbbda90d3863ea838b51bf368de09775a691 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 14 May 2021 09:58:17 +0000
+Subject: We don't use /usr/share
+
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 6c95ca0..c2ff933 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.0)
+ install (DIRECTORY bash fish vim hooks
+          DESTINATION ${TASK_DOCDIR}/scripts)
+ install (FILES zsh/_task
+-         DESTINATION share/zsh/site-functions)
++         DESTINATION ${TASK_DOCDIR}/zsh/site-functions)
+ install (DIRECTORY add-ons
+          DESTINATION ${TASK_DOCDIR}/scripts
+          FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-- 
+2.30.2
+
+
+From 3d6a538a7e848322447d50f04ffa783a6491f72a Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 14 May 2021 11:55:32 +0000
+Subject: Fix search for libnetwork on Haiku
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df4a3f8..31958bd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,6 +132,17 @@ if (SOLARIS)
+   endif (NSL_LIBRARY)
+ endif (SOLARIS)
+ 
++if (HAIKU)
++  # search for socket() in libnetwork on Haiku
++  message("-- Looking for libnetwork")
++  find_library (NETWORK_LIBRARY NAMES network)
++  if (NETWORK_LIBRARY)
++    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${NETWORK_LIBRARY})
++  else (NETWORK_LIBRARY)
++    message(FATAL_ERROR "-- libnetwork not found.")
++  endif (NETWORK_LIBRARY)
++endif (HAIKU)
++
+ message ("-- Configuring cmake.h")
+ configure_file (
+   ${CMAKE_SOURCE_DIR}/cmake.h.in
+-- 
+2.30.2
+
diff --git a/app-misc/task/task-2.6.0~git.recipe b/app-misc/task/task-2.6.0~git.recipe
new file mode 100644
index 000000000..286834ebd
--- /dev/null
+++ b/app-misc/task/task-2.6.0~git.recipe
@@ -0,0 +1,88 @@
+SUMMARY="A command-line todo list manager"
+DESCRIPTION="Taskwarrior is a command line task list management utility with \
+a multitude of features, developed as a portable open source project with an \
+active and quite vast ecosystem of tools, hooks and extensions."
+HOMEPAGE="https://taskwarrior.org"
+COPYRIGHT="20008-2021 Paul Beckingham
+  Federico Hernandez
+  Tomas Babej
+  David J Patrick
+  John Florian
+  Cory Donnelly
+  Johannes Schlatow
+  Dirk Deimeke
+  Wim Schuermann
+  Owen Clarke
+  Louis-Claude Canon
+  Scott Kostyshak
+  Renato Alves"
+LICENSE="MIT"
+REVISION="1"
+srcGitRev="4fff27f4bc9f0274caaef2e124eba61300a26f69"
+SOURCE_URI="https://github.com/GothenburgBitFactory/taskwarrior/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="fda110c31d3061c756987e45e8e0be4dc315a947d0622a07abdeb5f3b4d131c7"
+srcGitRev_2="9a5f24e2acb38d05afb8f8e316a966dee196a42a"
+SOURCE_URI_2="https://github.com/GothenburgBitFactory/libshared/archive/$srcGitRev_2.tar.gz"
+CHECKSUM_SHA256_2="2abc6e862c83f12138e1d736f13f503b726587eae350dd42594c7ad83d7463bf"
+SOURCE_FILENAME="task-v$portVersion-$srcGitRev.tar.gz"
+SOURCE_FILENAME_2="libshared-$srcGitRev_2.tar.gz"
+SOURCE_DIR="taskwarrior-$srcGitRev"
+PATCHES="task-$portVersion.patchset"
+PATCHES_2="task-$portVersion-source2.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	task$secondaryArchSuffix = $portVersion
+	cmd:task = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libgnutls$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgnutls$secondaryArchSuffix
+	devel:libuuid$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+TEST_REQUIRES="
+	cmd:python3
+	"
+
+BUILD()
+{
+	cp -rf $sourceDir2/libshared-$srcGitRev_2/* $sourceDir/src/libshared
+
+	mkdir -p build && cd build
+	cmake -DCMAKE_BUILD_TYPE=debug \
+		-DTASK_BINDIR=$prefix/bin \
+		-DTASK_DOCDIR=$docDir/ \
+		-DTASK_MAN1DIR=$manDir/man1 \
+		-DTASK_MAN5DIR=$manDir/man5 \
+		-DTASK_RCDIR=$docDir/rc \
+		-DBUILD_SHARED_LIBS=off ..
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+}
+
+TEST()
+{
+	# produces a few crashes
+	# 2712 tests OK, 1 test FAILED on 32bit
+	# 2713 tests OK, 0 test FAILED on 64bit
+	cd build/test
+	make $jobArgs && ./run_all && ./problems
+}