diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 6e3635f6977e..967ce24dbe81 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	libgcrypt
-DISTVERSION=	1.9.3
+DISTVERSION=	1.9.4
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	General purpose cryptographic library based on the code from GnuPG
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	libgpg-error>=1.32:security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.32: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
 TEST_TARGET=	check
 
 DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS THANKS TODO \
 		doc/HACKING doc/README.apichanges
 INFO=		gcrypt
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS STATIC
 OPTIONS_DEFAULT=	DOCS STATIC
 OPTIONS_SUB=	yes
 
 STATIC_CONFIGURE_ENABLE=	static
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "powerpc"
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
 CONFIGURE_ARGS+=	--disable-jent-support
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/gcrypt.info*
 	@${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 755e6903b090..4f3c2227ba25 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620588749
-SHA256 (libgcrypt-1.9.3.tar.bz2) = 97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd
-SIZE (libgcrypt-1.9.3.tar.bz2) = 3219061
+TIMESTAMP = 1629752433
+SHA256 (libgcrypt-1.9.4.tar.bz2) = ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7
+SIZE (libgcrypt-1.9.4.tar.bz2) = 3239704
diff --git a/security/libgcrypt/files/patch-random_jitterentropy-base.c b/security/libgcrypt/files/patch-random_jitterentropy-base.c
index f83893b72511..e1a9c81f9cda 100644
--- a/security/libgcrypt/files/patch-random_jitterentropy-base.c
+++ b/security/libgcrypt/files/patch-random_jitterentropy-base.c
@@ -1,10 +1,10 @@
---- random/jitterentropy-base.c.orig	2021-03-16 20:10:57.561791000 -0700
-+++ random/jitterentropy-base.c	2021-02-12 03:23:24.000000000 -0800
-@@ -51,6 +51,7 @@
- 
+--- random/jitterentropy-base.c.orig	2021-08-22 05:57:34.000000000 -0700
++++ random/jitterentropy-base.c	2021-08-23 14:05:29.630091000 -0700
+@@ -52,6 +52,7 @@
  #undef _FORTIFY_SOURCE
+ #ifdef __OPTIMIZE__
  #pragma GCC optimize ("O0")
 +#pragma clang optimize off
+ #endif
  
  #include "jitterentropy.h"
- 
diff --git a/security/libgcrypt/pkg-plist b/security/libgcrypt/pkg-plist
index 00796bc75bb1..a50a6c531588 100644
--- a/security/libgcrypt/pkg-plist
+++ b/security/libgcrypt/pkg-plist
@@ -1,12 +1,12 @@
 bin/mpicalc
 bin/dumpsexp
 bin/hmac256
 bin/libgcrypt-config
 include/gcrypt.h
 %%STATIC%%lib/libgcrypt.a
 lib/libgcrypt.so
 lib/libgcrypt.so.20
-lib/libgcrypt.so.20.3.3
+lib/libgcrypt.so.20.3.4
 libdata/pkgconfig/libgcrypt.pc
 man/man1/hmac256.1.gz
 share/aclocal/libgcrypt.m4