diff --git a/time/taskwarrior/Makefile b/time/taskwarrior/Makefile
index 7bb7ab752ef9..4f86dcbb986c 100644
--- a/time/taskwarrior/Makefile
+++ b/time/taskwarrior/Makefile
@@ -22,6 +22,9 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 CMAKE_ARGS+=	-DTASK_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
 CMAKE_ARGS+=	-DTASK_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=release
+
+LDFLAGS.SunOS+=	-lsocket -lnsl
 
 .include "options.mk"
 
diff --git a/time/taskwarrior/distinfo b/time/taskwarrior/distinfo
index 4654ab73e488..4420ea2a992d 100644
--- a/time/taskwarrior/distinfo
+++ b/time/taskwarrior/distinfo
@@ -4,4 +4,5 @@ SHA1 (task-2.5.1.tar.gz) = 647faf0784aa8ebe48cba3e2061f79e1ddbf3e84
 RMD160 (task-2.5.1.tar.gz) = ae04417ff7f007c6e01d4d6bd4dede67adc1e35f
 SHA512 (task-2.5.1.tar.gz) = ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10
 Size (task-2.5.1.tar.gz) = 903428 bytes
+SHA1 (patch-src_commands_CmdBurndown.cpp) = 36b7a4c1ce72652902705d80477b61dbd87b347e
 SHA1 (patch-src_commands_CmdEdit.cpp) = 07c33f7cb07e7459cc5eabacbe3b003afa8db060
diff --git a/time/taskwarrior/patches/patch-src_commands_CmdBurndown.cpp b/time/taskwarrior/patches/patch-src_commands_CmdBurndown.cpp
new file mode 100644
index 000000000000..fe383f07b446
--- /dev/null
+++ b/time/taskwarrior/patches/patch-src_commands_CmdBurndown.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Call of overloaded 'log10(unsigned int)' is ambiguous
+
+--- src/commands/CmdBurndown.cpp.orig	2016-02-24 22:18:11.000000000 +0000
++++ src/commands/CmdBurndown.cpp
+@@ -902,7 +902,7 @@ unsigned Chart::burndown_size (unsigned
+ 
+   // Choose the number from here rounded up to the nearest 10% of the next
+   // highest power of 10 or half of power of 10.
+-  const unsigned count = (unsigned) log10 (std::numeric_limits<unsigned>::max ());
++  const unsigned count = (unsigned) log10 ((double)std::numeric_limits<unsigned>::max ());
+   unsigned half = 500;
+   unsigned full = 1000;
+