diff --git a/srcpkgs/taskd/INSTALL b/srcpkgs/taskd/INSTALL
new file mode 100644
index 00000000000..460ac332dbf
--- /dev/null
+++ b/srcpkgs/taskd/INSTALL
@@ -0,0 +1,10 @@
+# INSTALL
+case "$ACTION" in
+post)
+	if [ "$UPDATE" != "yes" ]; then
+		taskd init --data /var/lib/taskd
+		taskd config --data /var/lib/taskd log /var/log/taskd.log
+		chown -R taskd:taskd /var/lib/taskd
+	fi
+	;;
+esac
diff --git a/srcpkgs/taskd/files/taskd/run b/srcpkgs/taskd/files/taskd/run
new file mode 100644
index 00000000000..6a7f0b97755
--- /dev/null
+++ b/srcpkgs/taskd/files/taskd/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+: ${TASKDDATA:=/var/lib/taskd}
+: ${TASKDUSER:=taskd}
+exec 2>&1
+exec chpst -u ${TASKDUSER} taskd --data ${TASKDDATA}
diff --git a/srcpkgs/taskd/patches/musl.patch b/srcpkgs/taskd/patches/musl.patch
new file mode 100644
index 00000000000..70f3fd315e5
--- /dev/null
+++ b/srcpkgs/taskd/patches/musl.patch
@@ -0,0 +1,10 @@
+--- ./src/Directory.cpp.orig	2015-10-23 19:01:36.570860470 -0400
++++ ./src/Directory.cpp	2015-10-23 19:02:12.097860878 -0400
+@@ -29,6 +29,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
diff --git a/srcpkgs/taskd/template b/srcpkgs/taskd/template
new file mode 100644
index 00000000000..08869a17363
--- /dev/null
+++ b/srcpkgs/taskd/template
@@ -0,0 +1,26 @@
+# Template file for 'taskd'
+pkgname=taskd
+version=1.1.0
+revision=1
+build_pie=yes
+build_style=cmake
+hostmakedepends="cmake"
+makedepends="libuuid-devel gnutls-devel"
+depends="gnutls-tools"
+short_desc="Server for sharing tasks among different clients, primarily Taskwarrior"
+maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
+license="MIT"
+homepage="http://taskwarrior.org"
+distfiles="http://taskwarrior.org/download/${pkgname}-${version}.tar.gz"
+checksum=7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4
+
+system_accounts="taskd"
+taskd_homedir="/var/lib/taskd"
+make_dirs="/var/lib/taskd 0750 taskd taskd"
+
+post_install () {
+	vcopy pki usr/share/taskd/
+	vlicense LICENSE
+	vsv taskd
+}
+