diff -urN /usr/ports/security/libgcrypt.old/Makefile /usr/ports/security/libgcrypt/Makefile
--- /usr/ports/security/libgcrypt.old/Makefile	2014-08-06 00:13:29.000000000 +0200
+++ /usr/ports/security/libgcrypt/Makefile	2014-08-12 11:11:17.000000000 +0200
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@
 BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 
-USES=		libtool makeinfo tar:bzip2
+USES=		compiler libtool makeinfo tar:bzip2
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
@@ -49,6 +49,13 @@
 
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == "gcc" && ${ARCH} == "amd64" && ${OSVERSION} < 900000
+USE_GCC=	any
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
+.endif
+
 post-patch:
 	${RM} -f ${WRKSRC}/doc/gcrypt.info*
 	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
diff -urN /usr/ports/security/libgcrypt.old/files/extra-patch-configure /usr/ports/security/libgcrypt/files/extra-patch-configure
--- /usr/ports/security/libgcrypt.old/files/extra-patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/security/libgcrypt/files/extra-patch-configure	2014-08-12 10:58:12.000000000 +0200
@@ -0,0 +1,11 @@
+--- configure.orig	2014-08-10 19:51:24.000000000 +0200
++++ configure	2014-08-10 19:52:26.000000000 +0200
+@@ -16493,7 +16493,7 @@
+ $as_echo "$gcry_cv_gcc_amd64_platform_as_ok" >&6; }
+   if test "$gcry_cv_gcc_amd64_platform_as_ok" = "yes" ; then
+ 
+-$as_echo "#define HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS 1" >>confdefs.h
++$as_echo "#undef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS" >>confdefs.h
+ 
+   fi
+ fi