diff --git a/Makefile.in b/Makefile.in
index 03200eb9d..a342c9a32 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,8 @@ ASKPASS_PROGRAM=@libdir@/ssh/ssh-askpass
 CC=@CC@
 PATHS=-DETCDIR=\"@sysconfdir@\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\"
 CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
-TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp
+EXTRA_TARGETS=@GNOME_ASKPASS@
+TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
 LIBS=@LIBS@
 AR=@AR@
 RANLIB=@RANLIB@
@@ -68,7 +69,11 @@ install:
 	ln -sf ssh $(bindir)/slogin
 	install -s -c scp $(bindir)/scp
 	install -s -c ssh-add $(bindir)/ssh-add
-	install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass
+	if [ -z "@GNOME_ASKPASS@"] ; then
+		install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass
+	else
+		install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass
+	fi
 	install -s -c ssh-agent $(bindir)/ssh-agent
 	install -s -c ssh-keygen $(bindir)/ssh-keygen
 	install -s -c sshd $(sbindir)/sshd
diff --git a/configure.in b/configure.in
index a03c2af2c..fc59cbb8b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
+
 AC_INIT(auth-krb4.c)
 
 AC_CONFIG_HEADER(config.h)
@@ -63,4 +64,10 @@ dnl Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle)
 
+dnl Check whether user wants GNOME ssh-askpass
+AC_ARG_WITH(gnome-askpass,
+	[  --with-gnome-askpass    Build and use the GNOME passphrase requester],
+	[GNOME_ASKPASS="gnome-ssh-askpass"])
+AC_SUBST(GNOME_ASKPASS)
+
 AC_OUTPUT(Makefile)