diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index e953b58b5659..4b11de66e401 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	6.3.1.s20170517
+PORTVERSION=	6.3.1.s20170524
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
@@ -35,7 +35,7 @@ DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo
index 1c466fa1087a..15d7deb9e0b6 100644
--- a/lang/gcc6-devel/distinfo
+++ b/lang/gcc6-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495296123
-SHA256 (gcc-6-20170517.tar.bz2) = 79f36ec196239ee1918574d14509918df6b4d009d00e951daeb8d810caedab92
-SIZE (gcc-6-20170517.tar.bz2) = 95753349
+TIMESTAMP = 1495785459
+SHA256 (gcc-6-20170524.tar.xz) = 4aab1f1b6b24816be6b740fa8689741b762e695686bd7f63e61fcce2561fe15a
+SIZE (gcc-6-20170524.tar.xz) = 76869020