diff --git a/x11/obconf/Makefile b/x11/obconf/Makefile
index 89385781d1a..3dee475eb09 100644
--- a/x11/obconf/Makefile
+++ b/x11/obconf/Makefile
@@ -1,36 +1,40 @@
-# $OpenBSD: Makefile,v 1.8 2007/07/13 08:54:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2007/07/29 13:04:19 ajacoutot Exp $
 
 COMMENT=	configuration utility for openbox
 
-DISTNAME=	obconf-2.0.1
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	obconf-2.0.2
 CATEGORIES=	x11
-MASTER_SITES=	http://icculus.org/openbox/obconf/
 
 HOMEPAGE=	http://icculus.org/openbox/index.php/Obconf
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
-WANTLIB=	ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi \
-		Xinerama Xrandr Xrender atk-1.0 c cairo expat \
-		fontconfig freetype glib-2.0 glitz gmodule-2.0 \
-		gobject-2.0 iconv intl m pango-1.0 pangocairo-1.0 \
-		pangoft2-1.0 pangoxft-1.0 png xml2 z
-
-LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
-		glade-2.0.>=0.1::devel/libglade2 \
-		startup-notification-1::devel/startup-notification \
-		obparser.>=5,obrender.>=5::x11/openbox
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	http://icculus.org/openbox/obconf/
+
+WANTLIB=	ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi \
+		Xinerama Xrandr Xrender atk-1.0 c cairo expat \
+		fontconfig freetype glib-2.0 glitz gmodule-2.0 \
+		gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+		pangoxft-1.0 png xml2 z
+
+MODULES=	devel/gettext
+LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
+		glade-2.0.>=0.1::devel/libglade2 \
+		startup-notification-1::devel/startup-notification \
+		obparser.>=6,obrender.>=6::x11/openbox
+RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
+
 USE_X11=	Yes
 USE_GMAKE=	Yes
+
 CONFIGURE_STYLE=gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
 
 .include <bsd.port.mk>
diff --git a/x11/obconf/distinfo b/x11/obconf/distinfo
index b7cb0adacd1..85fb1926ea1 100644
--- a/x11/obconf/distinfo
+++ b/x11/obconf/distinfo
@@ -1,5 +1,5 @@
-MD5 (obconf-2.0.1.tar.gz) = HqUsfeuPVpKEcPvnRx2d3A==
-RMD160 (obconf-2.0.1.tar.gz) = RWHwP7pOSNV/TrcEvcVvGwW1+dc=
-SHA1 (obconf-2.0.1.tar.gz) = knsZmV1OjSNbFLzu7TgoZewumPU=
-SHA256 (obconf-2.0.1.tar.gz) = mDqrxIL54UDkdf6l1R4XP7Ktu7AtamarLFmd+6XkzBw=
-SIZE (obconf-2.0.1.tar.gz) = 204780
+MD5 (obconf-2.0.2.tar.gz) = Gke7s8L0LxNMJaPvRyfN6Q==
+RMD160 (obconf-2.0.2.tar.gz) = EwulniAEmafCqRS6VwlTWkTRb6A=
+SHA1 (obconf-2.0.2.tar.gz) = O3uz0nsuynGioVfnZJwhNwGXXR8=
+SHA256 (obconf-2.0.2.tar.gz) = RL37EVxgnpRxWKpnKhwDKZaVre9umtKhfm5NdxIMnJ0=
+SIZE (obconf-2.0.2.tar.gz) = 247055
diff --git a/x11/obconf/patches/patch-configure b/x11/obconf/patches/patch-configure
new file mode 100644
index 00000000000..a76b62339c1
--- /dev/null
+++ b/x11/obconf/patches/patch-configure
@@ -0,0 +1,17 @@
+$OpenBSD: patch-configure,v 1.1 2007/07/29 13:04:19 ajacoutot Exp $
+--- configure.orig	Sun Jul 29 14:42:48 2007
++++ configure	Sun Jul 29 14:43:00 2007
+@@ -4830,12 +4830,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return * gettext ("") + _nl_msg_cat_cntr
+   ;
+   return 0;
+ }
diff --git a/x11/obconf/patches/patch-po_Makefile_in_in b/x11/obconf/patches/patch-po_Makefile_in_in
new file mode 100644
index 00000000000..650967a5a43
--- /dev/null
+++ b/x11/obconf/patches/patch-po_Makefile_in_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.1 2007/07/29 13:04:19 ajacoutot Exp $
+--- po/Makefile.in.in.orig	Sun Jul 29 14:45:30 2007
++++ po/Makefile.in.in	Sun Jul 29 14:45:51 2007
+@@ -31,7 +31,7 @@ gettextsrcdir = $(datadir)/gettext/po
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ mkinstalldirs = $(SHELL) @install_sh@ -d
+-mkdir_p = @mkdir_p@
++mkdir_p = $(mkinstalldirs)
+ 
+ GMSGFMT_ = @GMSGFMT@
+ GMSGFMT_no = @GMSGFMT@
diff --git a/x11/obconf/pkg/PLIST b/x11/obconf/pkg/PLIST
index b7bbf055edf..f10d50dbfe3 100644
--- a/x11/obconf/pkg/PLIST
+++ b/x11/obconf/pkg/PLIST
@@ -1,7 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/07/13 08:54:48 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2007/07/29 13:04:19 ajacoutot Exp $
 bin/obconf
 share/applications/
 share/applications/obconf.desktop
+share/locale/cs/LC_MESSAGES/obconf.mo
+share/locale/en@boldquot/LC_MESSAGES/obconf.mo
+share/locale/en@quot/LC_MESSAGES/obconf.mo
+share/locale/es/LC_MESSAGES/obconf.mo
+share/locale/fr/LC_MESSAGES/obconf.mo
+share/locale/it/LC_MESSAGES/obconf.mo
+share/locale/sv/LC_MESSAGES/obconf.mo
+share/locale/zh_TW/LC_MESSAGES/obconf.mo
 share/mime/
 share/mime/packages/
 share/mime/packages/obconf.xml
@@ -10,5 +18,6 @@ share/mimelnk/application/
 share/mimelnk/application/x-openbox-theme.desktop
 share/obconf/
 share/obconf/obconf.glade
+share/obconf/video-display.png
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database