diff --git a/common/shlibs b/common/shlibs
index 9206842b76d..b76f1342fa9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2041,10 +2041,10 @@ libprotobuf-c.so.1 protobuf-c-1.1.0_1
 libutf8proc.so.1 libutf8proc-1.1.6_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libfilteraudio.so.0 filteraudio-git-20150416_3
-libtoxcore.so.0 toxcore-git-20150604_1
-libtoxencryptsave.so.0 toxcore-git-20150604_1
-libtoxdns.so.0 toxcore-git-20150604_1
-libtoxav.so.0 toxcore-git-20150604_1
+libtoxcore.so.0 toxcore-0.1.2_1
+libtoxdns.so.0 toxcore-0.1.2_1
+libtoxencryptsave.so.0 toxcore-0.1.2_1
+libtoxav.so.0 toxcore-0.1.2_1
 libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.7.2_1
 libxmp.so.4 libxmp-4.3.7_1
diff --git a/srcpkgs/toxcore-devel b/srcpkgs/toxcore-devel
new file mode 120000
index 00000000000..4c88cfc4743
--- /dev/null
+++ b/srcpkgs/toxcore-devel
@@ -0,0 +1 @@
+toxcore
\ No newline at end of file
diff --git a/srcpkgs/toxcore/files/toxbootstrapd/run b/srcpkgs/toxcore/files/toxbootstrapd/run
new file mode 100644
index 00000000000..912467f3fe0
--- /dev/null
+++ b/srcpkgs/toxcore/files/toxbootstrapd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /etc/toxbootstrapd
+exec chpst -u toxbootstrapd DHT_bootstrap
diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template
new file mode 100644
index 00000000000..e956db10edf
--- /dev/null
+++ b/srcpkgs/toxcore/template
@@ -0,0 +1,39 @@
+# Template file for 'toxcore'
+pkgname=toxcore
+version=0.1.2
+revision=1
+build_style=gnu-configure
+wrksrc="c-toxcore-${version}"
+hostmakedepends="autoconf automake libtool pkg-config"
+makedepends="libsodium-devel opus-devel libvpx-devel"
+short_desc="Encrypted peer-to-peer instant messenger protocol library"
+maintainer="Spencer Hill <spencernh77@gmail.com>"
+license="GPL-3"
+homepage="https://tox.chat"
+distfiles="https://github.com/TokTok/c-toxcore/archive/v${version}.tar.gz"
+checksum=605a462f77b497009217b8dbd01108d112e9a8b018473826379f9f4ffa5c0b66
+
+configure_args="--enable-daemon"
+system_accounts="toxbootstrapd"
+toxbootstrapd_homedir="/etc/toxbootstrapd"
+make_dirs="/etc/toxbootstrapd 0700 toxbootstrapd toxbootstrapd"
+replaces="toxcore-git>=0"
+
+pre_configure() {
+	./autogen.sh
+}
+
+post_install() {
+	vsv toxbootstrapd
+}
+
+# Development package
+toxcore-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/pkgconfig
+	}
+}