diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index d0ee058476a..32eaaff7115 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2009/04/06 10:09:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2009/04/06 16:15:13 stsp Exp $
 
 SHARED_ONLY=	Yes
 
@@ -11,7 +11,7 @@ GNOME_VERSION=	2.24.2
 
 CATEGORIES=	graphics print
 
-PKGNAME-main=	${DISTNAME}p5
+PKGNAME-main=	${DISTNAME}p6
 PKGNAME-djvu=	evince-djvu-${GNOME_VERSION}
 PKGNAME-dvi=	evince-dvi-${GNOME_VERSION}
 
@@ -19,6 +19,9 @@ SHARED_LIBS=	evbackend	0.0 # .0.0
 
 HOMEPAGE=	http://www.gnome.org/projects/evince/
 
+MAINTAINER=	Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
+		Antoine Jacoutot <ajacoutot@openbsd.org>
+
 # GPLv2
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/graphics/evince/patches/patch-shell_ev-window_c b/graphics/evince/patches/patch-shell_ev-window_c
new file mode 100644
index 00000000000..9593e689150
--- /dev/null
+++ b/graphics/evince/patches/patch-shell_ev-window_c
@@ -0,0 +1,23 @@
+$OpenBSD: patch-shell_ev-window_c,v 1.1 2009/04/06 16:15:13 stsp Exp $
+
+Taken from http://bugzilla.gnome.org/show_bug.cgi?id=571051
+
+This prevents evince from stealing focus when reloading a document.
+Evince reloads documents automatically when they are changed while
+being displayed. Very annoying while editing LaTeX files and rebuilding
+the corresponding PDF.
+
+--- shell/ev-window.c.orig	Mon Apr  6 16:34:01 2009
++++ shell/ev-window.c	Mon Apr  6 16:34:10 2009
+@@ -926,6 +926,11 @@ setup_size_from_metadata (EvWindow *window)
+ 	GValue x = { 0, };
+ 	GValue y = { 0, };
+ 
++	/* Don't try to change the window when reloading a document */
++	if (window->priv->in_reload) {
++	    return;
++	}
++
+ 	if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) {
+ 		if (g_value_get_boolean (&maximized)) {
+ 			gtk_window_maximize (GTK_WINDOW (window));