diff -urN /usr/ports/security/libgcrypt.old/Makefile /usr/ports/security/libgcrypt/Makefile
--- /usr/ports/security/libgcrypt.old/Makefile	2015-01-02 19:46:33.000000000 +0100
+++ /usr/ports/security/libgcrypt/Makefile	2015-01-24 15:18:34.000000000 +0100
@@ -2,6 +2,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +22,6 @@
 CONFIGURE_ARGS=	--disable-drng-support
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
-INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
@@ -53,8 +53,15 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
+# Fix crash at cipher/salsa20.c module on amd64
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS:=${CFLAGS:N-O*} -O2
+.endif
+
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.20.0.2
+
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
diff -urN /usr/ports/security/libgcrypt.old/files/patch-cipher-Makefile.in /usr/ports/security/libgcrypt/files/patch-cipher-Makefile.in
--- /usr/ports/security/libgcrypt.old/files/patch-cipher-Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/security/libgcrypt/files/patch-cipher-Makefile.in	2015-01-21 19:15:40.000000000 +0100
@@ -0,0 +1,15 @@
+--- cipher/Makefile.in.orig	2015-01-21 19:09:47.000000000 +0100
++++ cipher/Makefile.in	2015-01-21 19:13:35.000000000 +0100
+@@ -766,6 +766,12 @@
+ tiger.lo: $(srcdir)/tiger.c
+ 	`echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) `
+ 
++salsa20.o: $(srcdir)/salsa20.c
++	`echo $(COMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) `
++
++salsa20.lo: $(srcdir)/salsa20.c
++	`echo $(LTCOMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) `
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: