diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index f98b29fb756b..048a05d003e5 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,71 +1,58 @@
 # $FreeBSD$
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.6.3
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 MAINTAINER=	cpm@fbsd.es
 COMMENT=	General purpose crypto library based on code used in GnuPG
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 
 USES=		cpe libtool makeinfo tar:bzip2
 CPE_VENDOR=	gnupg
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-drng-support
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 USE_LDCONFIG=	yes
 
 DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
 		README.GIT THANKS TODO doc/HACKING doc/README.apichanges
 INFO=		gcrypt
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "powerpc"
 CONFIGURE_ARGS+=	--disable-asm
-
-.elif ${ARCH} == "i386"
-.if (${OSVERSION} < 900033)
-CONFIGURE_ARGS+=	--disable-aesni-support
-.endif
-
 .endif
 
 post-patch:
 	${RM} -f ${WRKSRC}/doc/gcrypt.info*
 	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
 
-# Fix build without ASM on 8.x/amd64
-.if ${OPSYS} == FreeBSD && ${ARCH} == "amd64" && ${OSVERSION} < 900000
-USE_GCC=	any
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
-.endif
-
 # Fix crash at cipher/salsa20.c module on amd64
 .if ${ARCH} == "amd64" && exists(/usr/bin/clang)
 CFLAGS:=	${CFLAGS:N-O*} -O2
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.20.0.3
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 regression-test: build
 	cd ${WRKSRC} && ${MAKE_CMD} check
 
 .include <bsd.port.mk>
diff --git a/security/libgcrypt/files/extra-patch-configure b/security/libgcrypt/files/extra-patch-configure
deleted file mode 100644
index 9aa286ff144f..000000000000
--- a/security/libgcrypt/files/extra-patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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