diff --git a/security/putty/Makefile b/security/putty/Makefile
index 56f4499523d8..5a8bd1173805 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,111 +1,109 @@
 PORTNAME=		putty
 # https://tartarus.org/~simon/putty-prerel-snapshots/putty-0.83~pre20250105.1e45199.tar.gz
-DISTVERSION=		0.83
+DISTVERSION=		0.84
 PORTREVISION=		0
 #DISTVERSIONSUFFIX=	.ec158a2
 CATEGORIES=		security
 MASTER_SITES=		http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
 			LOCAL/mandree/
 #MASTER_SITES=		https://tartarus.org/~simon/putty-prerel-snapshots/ \
 #			LOCAL/mandree/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Secure shell and telnet client including xterm emulator
 WWW=		https://www.chiark.greenend.org.uk/~sgtatham/putty/
 # test plan: test ALL 4 GSSAPI_* options, GTK3 yes/no, WITH_DEBUG=yes build.
 
 LICENSE=	MIT
 LICENSE_FILE=	${PATCH_WRKSRC}/LICENCE
 
 USES=		cmake cpe perl5 pkgconfig
 USE_PERL5=	build
 
 CONFLICTS_INSTALL?=	pssh* putty-nogtk*
 
-PATCH_STRIP=	-p1
-
 PLIST_FILES=	bin/pageant \
 		bin/plink \
 		bin/pscp \
 		bin/psftp \
 		bin/psusan \
 		bin/puttygen \
 		share/man/man1/pageant.1.gz \
 		share/man/man1/plink.1.gz \
 		share/man/man1/pscp.1.gz \
 		share/man/man1/psftp.1.gz \
 		share/man/man1/psusan.1.gz \
 		share/man/man1/puttygen.1.gz
 
 OPTIONS_DEFINE=			GTK3
 OPTIONS_DEFAULT=		GSSAPI_BASE GTK3
 OPTIONS_SINGLE=			GSSAPI_SELECT
 OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT \
 				GSSAPI_NONE
 
 .include <bsd.port.options.mk>
 
 LDFLAGS+=	-Wl,--as-needed
 
 # XXX FIXME this is simplified on these assumptions:
 # - we only support GTK3 in FreeBSD
 #   (Putty would support EOL GTK2 and GTK1 as well)
 # - Putty 0.77 cannot have X11 without the gdk/gdkx.h header i. e. GTK.
 .if ${PORT_OPTIONS:MGTK3} && !defined(WITHOUT_X11)
 USES+=		xorg
 USE_XORG=	x11
 USES+=		gnome
 USE_GNOME=	cairo gdkpixbuf gtk30
 CMAKE_ARGS+=	-DPUTTY_GTK_VERSION:STRING=3
 
 PLIST_FILES+=	bin/pterm \
 		bin/putty \
 		share/man/man1/pterm.1.gz \
 		share/man/man1/putty.1.gz \
 		share/pixmaps/putty.ico
 DESKTOP_ENTRIES=	"PuTTY" \
 			"${COMMENT}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 			"${PORTNAME}" \
 			"" \
 			false
 .else
 CMAKE_ARGS+=	-DPUTTY_GTK_VERSION:STRING=NONE
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI_BASE} # Heimdal-like in base system
 USES+=		gssapi:base,flags
 CMAKE_ARGS+=	-DKRB5_CONFIG:PATH=${KRB5CONFIG} \
 		-DPUTTY_GSSAPI:STRING=STATIC
 .elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
 USES+=		gssapi:heimdal,flags
 CMAKE_ARGS+=	-DKRB5_CONFIG:PATH=${KRB5CONFIG} \
 		-DPUTTY_GSSAPI:STRING=STATIC
 .elif ${PORT_OPTIONS:MGSSAPI_MIT}
 USES+=		gssapi:mit,flags
 CMAKE_ARGS+=	-DKRB5_CONFIG:PATH=${KRB5CONFIG} \
 		-DPUTTY_GSSAPI:STRING=STATIC
 .else
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=OFF
 .endif
 
 post-patch:
 # we don't want to inherit FreeBSD commits
 # as PUTTY Git commit revisions,
 # so pretend we do not have Git:
 	${REINPLACE_CMD} '/FindGit/d' \
 		${WRKSRC}/cmake/setup.cmake \
 		${WRKSRC}/doc/CMakeLists.txt
 # nuke pkg-config detection of GSSAPI/Kerberos libs,
 # it interferes with FreeBSD's krb5-config approach
 	${REINPLACE_CMD} '/pkg_check_modules(KRB5 krb5-gssapi)/d' \
 		${WRKSRC}/cmake/platforms/unix.cmake
 
 post-install:
 .if ${PORT_OPTIONS:MGTK3}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/windows/putty.ico \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/putty/distinfo b/security/putty/distinfo
index 78d44287e9d2..64657abdc0d4 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739055533
-SHA256 (putty-0.83.tar.gz) = 718777c13d63d0dff91fe03162bc2a05b4dfc8b0827634cd60b51cefdff631c6
-SIZE (putty-0.83.tar.gz) = 3007178
+TIMESTAMP = 1779420053
+SHA256 (putty-0.84.tar.gz) = 06057862ae198f1dbd219d0c7493080d59f606194bb5056c549e342aa01b69fe
+SIZE (putty-0.84.tar.gz) = 3005843
diff --git a/security/putty/files/patch-utils_subprocess__waiter.c b/security/putty/files/patch-utils_subprocess__waiter.c
new file mode 100644
index 000000000000..9bf8a09edb4f
--- /dev/null
+++ b/security/putty/files/patch-utils_subprocess__waiter.c
@@ -0,0 +1,10 @@
+--- unix/utils/subprocess_waiter.c.orig	2026-05-14 19:28:47 UTC
++++ unix/utils/subprocess_waiter.c
+@@ -9,6 +9,7 @@
+ #include "tree234.h"
+ 
+ #include <unistd.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ 
+ struct SubprocessWaiter {