diff --git a/ChangeLog b/ChangeLog
index f387498ed..bb6b43e06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    so HAVE_SELECT is not defined and the poll(2) compat code doesn't get
    built in.  Remove HAVE_SELECT so we can build on platforms without poll.
  - (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H.
+ - (djm) [contrib/gnome-ssh-askpass2.h] Keep askpass windown on top. From
+   Debian patch via bernd AT openbsd.org
 
 20080228
  - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes
@@ -3651,4 +3653,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4848 2008/02/29 04:07:01 dtucker Exp $
+$Id: ChangeLog,v 1.4849 2008/02/29 11:53:40 djm Exp $
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 0ce8daec9..901176dbb 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -111,6 +111,7 @@ passphrase_dialog(char *message)
 
 	gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH");
 	gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+	gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
 	gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label),
 				TRUE);