diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile
index 0263f87592be..e2c1fca13e00 100644
--- a/security/gnome-ssh-askpass/Makefile
+++ b/security/gnome-ssh-askpass/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	gnome-ssh-askpass
-PORTVERSION=	6.6p1
-PORTREVISION=	1
+PORTVERSION=	6.7p1
 CATEGORIES=	security gnome
 MASTER_SITES=	OPENBSD/OpenSSH/portable/
 DISTNAME=	openssh-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Graphical SSH askpass utility for Gnome2
 
 #LICENSE=      BSD2,BSD3,MIT,public domain,BSD-Style,BEER-WARE,"any purpose with notice intact",ISC-Style
 #LICENSE_FILE= ${WRKSRC}/LICENCE
 
-PORTSCOUT=	limit:^6\.6 # Will update when FreeBSD version off SSH goes to 5.9p1
+DEPRECATED=	Uses deprecated gtk2 library
+EXPIRATION_DATE=	2024-12-31
 
 WRKSRC=		${WRKDIR}/openssh-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/contrib
 ALL_TARGET=	gnome-ssh-askpass2
 
 PLIST_FILES=	bin/gnome-ssh-askpass2
 USES=		gnome pkgconfig
 USE_GNOME=	gtk20
 
 CFLAGS+=	-lpthread
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gnome-ssh-askpass2 \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/security/gnome-ssh-askpass/distinfo b/security/gnome-ssh-askpass/distinfo
index 371cf1735183..88d12a2dd015 100644
--- a/security/gnome-ssh-askpass/distinfo
+++ b/security/gnome-ssh-askpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476630437
-SHA256 (openssh-6.6p1.tar.gz) = 48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb
-SIZE (openssh-6.6p1.tar.gz) = 1282502
+TIMESTAMP = 1710683146
+SHA256 (openssh-6.7p1.tar.gz) = b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507
+SIZE (openssh-6.7p1.tar.gz) = 1351367
diff --git a/security/gnome-ssh-askpass/files/patch-contrib_ssh-askpass2.c b/security/gnome-ssh-askpass/files/patch-contrib_gnome-ssh-askpass2.c
similarity index 84%
rename from security/gnome-ssh-askpass/files/patch-contrib_ssh-askpass2.c
rename to security/gnome-ssh-askpass/files/patch-contrib_gnome-ssh-askpass2.c
index 3c3f601fd3f3..281d2981379d 100644
--- a/security/gnome-ssh-askpass/files/patch-contrib_ssh-askpass2.c
+++ b/security/gnome-ssh-askpass/files/patch-contrib_gnome-ssh-askpass2.c
@@ -1,58 +1,58 @@
---- contrib/gnome-ssh-askpass2.c.orig  Tue Sep 19 09:58:45 2006
-+++ contrib/gnome-ssh-askpass2.c       Tue Sep 19 10:03:27 2006
-@@ -88,12 +88,13 @@
+--- contrib/gnome-ssh-askpass2.c.orig	2009-11-18 06:51:59 UTC
++++ contrib/gnome-ssh-askpass2.c
+@@ -88,12 +88,13 @@ passphrase_dialog(char *message)
  {
  	const char *failed;
  	char *passphrase, *local;
 -	int result, grab_tries, grab_server, grab_pointer;
 +	int result, grab_tries, grab_server, grab_pointer, grab_keyboard;
  	GtkWidget *dialog, *entry;
  	GdkGrabStatus status;
  
  	grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL);
  	grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL);
 +	grab_keyboard = (getenv("GNOME_SSH_ASKPASS_GRAB_KEYBOARD") != NULL);
  	grab_tries = 0;
  
  	dialog = gtk_message_dialog_new(NULL, 0,
-@@ -135,17 +136,21 @@
+@@ -138,17 +139,21 @@ passphrase_dialog(char *message)
  			}
  		}
  	}
 -	for(;;) {
 -		status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window,
 -		   FALSE, GDK_CURRENT_TIME);
 -		if (status == GDK_GRAB_SUCCESS)
 -			break;
 -		usleep(GRAB_WAIT * 1000);
 -		if (++grab_tries > GRAB_TRIES) {
 -			failed = "keyboard";
 -			goto nograbkb;
 +
 +	if (grab_keyboard) {
 +		for(;;) {
 +			status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window,
 +			   FALSE, GDK_CURRENT_TIME);
 +			if (status == GDK_GRAB_SUCCESS)
 +				break;
 +			usleep(GRAB_WAIT * 1000);
 +			if (++grab_tries > GRAB_TRIES) {
 +				failed = "keyboard";
 +				goto nograbkb;
 +			}
  		}
  	}
 +
  	if (grab_server) {
  		gdk_x11_grab_server();
  	}
-@@ -157,7 +162,8 @@
+@@ -160,7 +165,8 @@ passphrase_dialog(char *message)
  		XUngrabServer(GDK_DISPLAY());
  	if (grab_pointer)
  		gdk_pointer_ungrab(GDK_CURRENT_TIME);
 -	gdk_keyboard_ungrab(GDK_CURRENT_TIME);
 +	if (grab_keyboard)
 +		gdk_keyboard_ungrab(GDK_CURRENT_TIME);
  	gdk_flush();
  
  	/* Report passphrase if user selected OK */