Index: lang/gcc6-aux/Makefile
===================================================================
--- lang/gcc6-aux/Makefile
+++ lang/gcc6-aux/Makefile
@@ -57,6 +57,8 @@
 BOOTSTRAP_COMPILER=	ada-bootstrap.aarch64.freebsd.120.tar.bz2
 .  elif ${ARCH} == amd64 && ${OSVERSION} > 1200030 #ino64
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.120.tar.bz2
+.  elif ${ARCH} == i386  && ${OSVERSION} > 1200030 #ino64
+BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.120.tar.bz2
 .  else
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
 .  endif
@@ -116,10 +118,12 @@
 # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
 .if defined(PLUS_BOOTSTRAPS)
 DISTFILES=	\
-   ${IDENTIFICATION}.tar.bz2 \
+   ${IDENTIFICATION}.tar.xz \
    ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \
+   ada-bootstrap.i386.freebsd.120.tar.bz2:boot \
    ada-bootstrap.x86_64.dragonfly.41.tar.bz2:boot \
    ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot \
+   ada-bootstrap.x86_64.freebsd.120.tar.bz2:boot \
    ada-bootstrap.aarch64.freebsd.120.tar.bz2:boot
 .endif
 
@@ -217,6 +221,8 @@
 		${WRKSRC}/gcc/config/i386/freebsd64.h \
 		${WRKSRC}/gcc/config/i386/freebsd.h \
 		${WRKSRC}/gcc/config/aarch64/aarch64-freebsd.h
+	@${REINPLACE_CMD} -e 's|static:crtbeginT.o%s;||' \
+		${WRKSRC}/gcc/config/freebsd-spec.h
 .if defined(MODERN_BINUTILS)
 	# Use dwarf4-compatible addr2line (affects FreeBSD only)
 	${REINPLACE_CMD} -e 's|/usr/bin/addr2line|${PREFIX}/bin/addr2line|g' \
Index: lang/gcc6-aux/Makefile.version
===================================================================
--- lang/gcc6-aux/Makefile.version
+++ lang/gcc6-aux/Makefile.version
@@ -1,15 +1,20 @@
 # $FreeBSD$
 
+# The attempt to upgrade to version 6.4.1 was done incorrectly.
+# When 6.5.1 is released, set the SNAPSHOT to the release date,
+# but also set BUILD_RELEASE to "yes".  Otherwise snapshots will
+# continue to be used and eventually be removed from mirrors.
+
 GCC_BRANCH=		6
-GCC_POINT=		4.1
+GCC_POINT=		5.0
 GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
-SNAPSHOT=		20170802
+SNAPSHOT=		20180516
 BUILD_RELEASE=		no
-MAIN_PR=		1
-UTIL_PR=		1
-ARMV7_PR=		2
-ARM64_PR=		3
-X86_PR=			2
+MAIN_PR=		0
+UTIL_PR=		0
+ARMV7_PR=		0
+ARM64_PR=		0
+X86_PR=			0
 
 .if ${BUILD_RELEASE:Mno}
 # Snapshot naming pattern