diff --git a/common/shlibs b/common/shlibs
index 6762b8ae44e..3ff4ad53e5f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1964,7 +1964,7 @@ 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-20150313_1
-libtoxcore.so.0 toxcore-git-20150313_1
-libtoxencryptsave.so.0 toxcore-git-20150313_1
-libtoxdns.so.0 toxcore-git-20150313_1
-libtoxav.so.0 toxcore-git-20150313_1
+libtoxcore.so.0 toxcore-git-20150313_2
+libtoxencryptsave.so.0 toxcore-git-20150313_2
+libtoxdns.so.0 toxcore-git-20150313_2
+libtoxav.so.0 toxcore-git-20150313_2
diff --git a/srcpkgs/toxcore-git/template b/srcpkgs/toxcore-git/template
index dc26ce6d337..7b7f0238b04 100644
--- a/srcpkgs/toxcore-git/template
+++ b/srcpkgs/toxcore-git/template
@@ -1,19 +1,19 @@
 # Template file for 'toxcore-git'
 pkgname="toxcore-git"
 version="20150313"
-revision=1
+revision=2
+_commithash="4ad76497881ee2a623acdedcf0ac10406208b716"
 short_desc="Encrypted peer-to-peer instant messenger protocol library"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-3"
 homepage="https://tox.im"
 makedepends="libsodium-devel opus-devel libvpx-devel"
-hostmakedepends="git autoconf automake libtool pkg-config"
+hostmakedepends="autoconf automake libtool pkg-config"
+distfiles="https://github.com/irungentoo/toxcore/archive/${_commithash}.tar.gz"
+checksum="97087e7080267f2e27ffca125a507cd76173718242e31b8ca776cf313ad9d421"
+wrksrc="toxcore-${_commithash}"
 build_style="gnu-configure"
 
-do_fetch() {
-	git clone https://github.com/irungentoo/toxcore.git ${wrksrc}
-}
-
 pre_configure() {
 	./autogen.sh
 }
diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template
new file mode 100644
index 00000000000..805e0182136
--- /dev/null
+++ b/srcpkgs/toxic/template
@@ -0,0 +1,19 @@
+# Template file for 'toxic'
+pkgname="toxic"
+version="0.5.2"
+revision=1
+_commithash="0c39e7b158ff74a2ef4ed62a72b5b7a3c878ac7f"
+short_desc="NCurses-based TOX instant messanger client"
+maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
+license="GPL-3"
+homepage="https://wiki.tox.im/Toxic"
+depends="toxcore-git>=20150313_2"
+makedepends="toxcore-devel-git libX11-devel freealut-devel libconfig-devel ncurses-devel libopenal-devel libnotify-devel libvpx-devel libsodium-devel opus-devel"
+hostmakedepends="pkg-config"
+build_style="gnu-makefile"
+distfiles="https://github.com/Tox/toxic/archive/${_commithash}.tar.gz"
+checksum="14990c674363004b7d2d4c14706f8a6232eb0b546e7b8f9889867761de548435"
+make_install_args="-C build ${make_install_args}"
+make_build_args="${make_install_args}"
+wrksrc="toxic-${_commithash}"
+