diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index d347904bdf4c..8d4355d0106d 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	NLS
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
 
-USES=		bison gmake libtool tar:bzip2
+USES=		bison gmake libtool tar:bzip2 compiler:env
 GNU_CONFIGURE=	yes
 
 .if defined(PKGNAMEPREFIX)
@@ -53,10 +53,10 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 # Actual earliest version may differ slightly
-.if ${ARCH} != ia64 && ${ARCH} != mips && ${OSVERSION} >= 900044 && !defined(PKGNAMEPREFIX)
+.if ${ARCH} != ia64 && ${ARCH} != mips && ${OSVERSION} >= 900044 && !defined(PKGNAMEPREFIX) && (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 34 || ${COMPILER_TYPE} == gcc)
 CONFIGURE_ARGS+=	--enable-gold --enable-plugins
 PLIST_SUB+=	GOLD=""
 .else
@@ -87,4 +87,4 @@ post-install:
 	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>