diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 5ce815586196..0bb36c467c84 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	toxcore
-PORTVERSION=	0.150317
+PORTVERSION=	0.150401
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -19,8 +19,7 @@ LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx		\
 USE_GITHUB=	yes
 GH_ACCOUNT=	irungentoo
 GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	4ad7649
+GH_TAGNAME=	a47fad1
 
 USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
 AUTOMAKE_ARGS=	-a -c -f
@@ -54,7 +53,7 @@ DAEMON_LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
 USE_GCC=	yes
-BROKEN_i386=	'__stack_chk_fail_local' isn't defined
+BROKEN_i386=	'__stack_chk_fail_local' is not defined
 .endif
 
 .if ${PORT_OPTIONS:MDAEMON}
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index b644651dccd8..24412ebe4268 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (toxcore-0.150317.tar.gz) = bfff413a0d254eb42bb86cc1b4d3bfd21e6969b5ab091f9420ec8838abee7d3b
-SIZE (toxcore-0.150317.tar.gz) = 352871
+SHA256 (irungentoo-toxcore-0.150401-a47fad1_GH0.tar.gz) = 1e70291f91d1664607e6bf4230d8a077ee1d8dbdea4796ccdfa069a1f3f4679c
+SIZE (irungentoo-toxcore-0.150401-a47fad1_GH0.tar.gz) = 347407
diff --git a/net-im/tox/pkg-plist b/net-im/tox/pkg-plist
index cc5877736339..3c541f0ab78f 100644
--- a/net-im/tox/pkg-plist
+++ b/net-im/tox/pkg-plist
@@ -2,6 +2,7 @@ bin/DHT_bootstrap
 %%DAEMON%%bin/tox-bootstrapd
 %%DAEMON%%@sample etc/tox-bootstrapd.conf.sample
 include/tox/tox.h
+include/tox/tox_old.h
 include/tox/toxav.h
 include/tox/toxdns.h
 include/tox/toxencryptsave.h
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index 60dbb64c2df8..dc946a444e8c 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	toxic
-PORTVERSION=	0.5.2.150319
+PORTVERSION=	0.6.0.150401
 CATEGORIES=	net-im
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -18,8 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tox
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	a64b8ca
+GH_TAGNAME=	e998c8a
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
@@ -28,9 +27,6 @@ X11_USE=	XORG=x11
 X11_MAKE_ARGS_OFF=	DISABLE_X11=1 DISABLE_DESKTOP_NOTIFY=1
 X11_LIB_DEPENDS=libnotify.so:${PORTSDIR}/devel/libnotify
 
-WRKSRC=		${WRKDIR}/Tox-${PORTNAME}-${GH_COMMIT}
-BUILD_WRKSRC=	${WRKSRC}/build
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_ENV=	USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
 
diff --git a/net-im/toxic/distinfo b/net-im/toxic/distinfo
index 2d097d8b2391..e31483b38fcd 100644
--- a/net-im/toxic/distinfo
+++ b/net-im/toxic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (toxic-0.5.2.150319.tar.gz) = 0d75e88e361c1ecd4ce61b1324c9fc55fb23598a18ae5964db5e7c00f8b4cd27
-SIZE (toxic-0.5.2.150319.tar.gz) = 1106896
+SHA256 (tox-toxic-0.6.0.150401-e998c8a_GH0.tar.gz) = 24d1ac72300d239d49e6003ad8b7eb90167130323108c0457d54b2c18ad0ef77
+SIZE (tox-toxic-0.6.0.150401-e998c8a_GH0.tar.gz) = 1107441