diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index d41254097bf..363f147f0a6 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.5 2009/08/11 08:42:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2009/11/10 22:42:17 kili Exp $
 
 COMMENT=		X11 program launcher
 
-DISTNAME=		gmrun-0.9
-PKGNAME=		${DISTNAME}p3
+DISTNAME=		gmrun-0.9.2
 
 CATEGORIES=		x11
 
-HOMEPAGE=		http://www.bazon.net/mishoo/gmrun.epl
+HOMEPAGE=		http://gmrun.sourceforge.net/
 
 MAINTAINER=		Matthias Kilian <kili@openbsd.org>
 
@@ -27,10 +26,12 @@ MODULES=		devel/gettext
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gmrun/}
 
-LIB_DEPENDS=		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
+			popt::devel/popt
 
 USE_X11=		Yes
 
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gmrun/distinfo b/x11/gmrun/distinfo
index 23cb3e1eefe..036c254acd9 100644
--- a/x11/gmrun/distinfo
+++ b/x11/gmrun/distinfo
@@ -1,5 +1,5 @@
-MD5 (gmrun-0.9.tar.gz) = YzROroQ0CeJb+hDybyjRQg==
-RMD160 (gmrun-0.9.tar.gz) = GtMoxtssMuseoa1u3gNsJF04N3w=
-SHA1 (gmrun-0.9.tar.gz) = Zc8dzkZzvDJBBTmmqCbpvqJ9ylw=
-SHA256 (gmrun-0.9.tar.gz) = pG0oL6D3dldYACxl7YW9tB2o+kwr0Z1W2tMsUVVB/iQ=
-SIZE (gmrun-0.9.tar.gz) = 91706
+MD5 (gmrun-0.9.2.tar.gz) = bO83qWgAbZSW/FanCZxgPA==
+RMD160 (gmrun-0.9.2.tar.gz) = jK5nqmPZXINH1mtpC5yrsVgxlRY=
+SHA1 (gmrun-0.9.2.tar.gz) = ztVOKH+lZliTxB0OMpQLFnICegI=
+SHA256 (gmrun-0.9.2.tar.gz) = Fyl7zlMknMxxRZMdsiJRtH93rDVfeM+Kvx6HrhY0H6A=
+SIZE (gmrun-0.9.2.tar.gz) = 66097
diff --git a/x11/gmrun/patches/patch-src_gtkcompletionline_cc b/x11/gmrun/patches/patch-src_gtkcompletionline_cc
index 9bb962d413b..f671d4164e1 100644
--- a/x11/gmrun/patches/patch-src_gtkcompletionline_cc
+++ b/x11/gmrun/patches/patch-src_gtkcompletionline_cc
@@ -1,7 +1,19 @@
-$OpenBSD: patch-src_gtkcompletionline_cc,v 1.1.1.1 2007/07/29 18:47:29 kili Exp $
---- src/gtkcompletionline.cc.orig	Sun Jun 22 01:14:34 2003
-+++ src/gtkcompletionline.cc	Sun Jul 29 18:29:24 2007
-@@ -348,7 +348,7 @@ generate_path()
+$OpenBSD: patch-src_gtkcompletionline_cc,v 1.2 2009/11/10 22:42:17 kili Exp $
+--- src/gtkcompletionline.cc.orig	Sun Nov 16 11:55:07 2003
++++ src/gtkcompletionline.cc	Tue Nov 10 23:33:28 2009
+@@ -76,9 +76,9 @@ static gboolean
+ on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
+ 
+ /* get_type */
+-guint gtk_completion_line_get_type(void)
++GtkType gtk_completion_line_get_type(void)
+ {
+-  static guint type = 0;
++  static GtkType type = 0;
+   if (type == 0)
+   {
+     GtkTypeInfo type_info =
+@@ -350,7 +350,7 @@ generate_path()
  }
  
  static int
diff --git a/x11/gmrun/patches/patch-src_gtkcompletionline_h b/x11/gmrun/patches/patch-src_gtkcompletionline_h
new file mode 100644
index 00000000000..aab173bd56d
--- /dev/null
+++ b/x11/gmrun/patches/patch-src_gtkcompletionline_h
@@ -0,0 +1,20 @@
+$OpenBSD: patch-src_gtkcompletionline_h,v 1.1 2009/11/10 22:42:17 kili Exp $
+--- src/gtkcompletionline.h.orig	Sun Nov 16 11:43:32 2003
++++ src/gtkcompletionline.h	Tue Nov 10 23:30:50 2009
+@@ -14,6 +14,7 @@
+ #define __GTKCOMPLETIONLINE_H__
+ 
+ #include <gtk/gtkentry.h>
++#include <gtk/gtktypeutils.h>
+ 
+ #include <string>
+ 
+@@ -76,7 +77,7 @@ extern "C++" {
+     void (* cancel)(GtkCompletionLine *cl);
+   };
+ 
+-  guint gtk_completion_line_get_type(void);
++  GtkType gtk_completion_line_get_type(void);
+   GtkWidget *gtk_completion_line_new();
+ 
+   void gtk_completion_line_last_history_item(GtkCompletionLine*);
diff --git a/x11/gmrun/pkg/PLIST b/x11/gmrun/pkg/PLIST
index 5449d793635..817481d21cb 100644
--- a/x11/gmrun/pkg/PLIST
+++ b/x11/gmrun/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/29 18:47:29 kili Exp $
-bin/gmrun
+@comment $OpenBSD: PLIST,v 1.2 2009/11/10 22:42:17 kili Exp $
+@bin bin/gmrun
 share/gmrun/
 share/gmrun/gmrunrc