diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index ce7d4e8a97e..704b2401af0 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -1,20 +1,20 @@
-# $OpenBSD: Makefile,v 1.14 2011/08/01 19:36:02 stephan Exp $
+# $OpenBSD: Makefile,v 1.15 2011/08/17 23:13:44 ajacoutot Exp $
 
 COMMENT =	simple and fast image viewer for X
 
-DISTNAME =	gpicview-0.2.1
-REVISION =	5
+DISTNAME =	gpicview-0.2.2
 
 CATEGORIES =	graphics x11
 
-HOMEPAGE =	http://lxde.org/
+HOMEPAGE =	http://lxde.sourceforge.net/gpicview/
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype glib-2.0 gmodule-2.0 gobject-2.0 jpeg
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
-WANTLIB += gio-2.0 pthread pthread-stubs xcb z gdk_pixbuf-2.0
-WANTLIB += gdk-x11-2.0 gtk-x11-2.0
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
+WANTLIB += drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
+WANTLIB += xcb-shm z
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =		Yes
diff --git a/graphics/gpicview/distinfo b/graphics/gpicview/distinfo
index d05bffb6890..012c6c2ea98 100644
--- a/graphics/gpicview/distinfo
+++ b/graphics/gpicview/distinfo
@@ -1,5 +1,5 @@
-MD5 (gpicview-0.2.1.tar.gz) = ot4lW/m9xAdGwNyJs0VKEA==
-RMD160 (gpicview-0.2.1.tar.gz) = XVc8DCKJ/gEbvPoVaoOwoT6zeIc=
-SHA1 (gpicview-0.2.1.tar.gz) = Rxq58IQhXLAkZVxy34+nH7ZTb1g=
-SHA256 (gpicview-0.2.1.tar.gz) = TIXvWv+6CBKyJCYheHHMGDZvpXDhldxDpeDxf7wAVjk=
-SIZE (gpicview-0.2.1.tar.gz) = 422527
+MD5 (gpicview-0.2.2.tar.gz) = lD2p9KI1QazNWs3U+2mWbw==
+RMD160 (gpicview-0.2.2.tar.gz) = Yg5eYpB/pe8ztYb8S/yZPfFzyMY=
+SHA1 (gpicview-0.2.2.tar.gz) = veEJwj3JSX8YoGlEzTjJXcjzSCE=
+SHA256 (gpicview-0.2.2.tar.gz) = fGLjloBMLpfj1u6gcdwYZesgfy9JnKWrNbLnaHSdA2w=
+SIZE (gpicview-0.2.2.tar.gz) = 471953
diff --git a/graphics/gpicview/pkg/PLIST b/graphics/gpicview/pkg/PLIST
index fcc1b19bd83..56af518ea8a 100644
--- a/graphics/gpicview/pkg/PLIST
+++ b/graphics/gpicview/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/12/22 16:06:40 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/08/17 23:13:44 ajacoutot Exp $
 @bin bin/gpicview
 share/applications/gpicview.desktop
 share/gpicview/
@@ -15,10 +15,22 @@ share/locale/af/LC_MESSAGES/gpicview.mo
 share/locale/ar/
 share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/gpicview.mo
+share/locale/bg/LC_MESSAGES/gpicview.mo
+share/locale/bn/
+share/locale/bn/LC_MESSAGES/
+share/locale/bn/LC_MESSAGES/gpicview.mo
+share/locale/bn_IN/
+share/locale/bn_IN/LC_MESSAGES/
+share/locale/bn_IN/LC_MESSAGES/gpicview.mo
+share/locale/ca/LC_MESSAGES/gpicview.mo
 share/locale/cs/LC_MESSAGES/gpicview.mo
 share/locale/da/LC_MESSAGES/gpicview.mo
 share/locale/de/LC_MESSAGES/gpicview.mo
+share/locale/el/LC_MESSAGES/gpicview.mo
 share/locale/es/LC_MESSAGES/gpicview.mo
+share/locale/es_VE/
+share/locale/es_VE/LC_MESSAGES/
+share/locale/es_VE/LC_MESSAGES/gpicview.mo
 share/locale/et/LC_MESSAGES/gpicview.mo
 share/locale/eu/LC_MESSAGES/gpicview.mo
 share/locale/fa/
@@ -26,7 +38,11 @@ share/locale/fa/LC_MESSAGES/
 share/locale/fa/LC_MESSAGES/gpicview.mo
 share/locale/fi/LC_MESSAGES/gpicview.mo
 share/locale/fr/LC_MESSAGES/gpicview.mo
+share/locale/frp/
+share/locale/frp/LC_MESSAGES/
+share/locale/frp/LC_MESSAGES/gpicview.mo
 share/locale/gl/LC_MESSAGES/gpicview.mo
+share/locale/he/LC_MESSAGES/gpicview.mo
 share/locale/hr/LC_MESSAGES/gpicview.mo
 share/locale/hu/LC_MESSAGES/gpicview.mo
 share/locale/id/LC_MESSAGES/gpicview.mo
@@ -54,7 +70,11 @@ share/locale/pt_BR/LC_MESSAGES/gpicview.mo
 share/locale/ru/LC_MESSAGES/gpicview.mo
 share/locale/sk/LC_MESSAGES/gpicview.mo
 share/locale/sl/LC_MESSAGES/gpicview.mo
+share/locale/sr/LC_MESSAGES/gpicview.mo
 share/locale/sv/LC_MESSAGES/gpicview.mo
+share/locale/th/
+share/locale/th/LC_MESSAGES/
+share/locale/th/LC_MESSAGES/gpicview.mo
 share/locale/tr/LC_MESSAGES/gpicview.mo
 share/locale/uk/LC_MESSAGES/gpicview.mo
 share/locale/ur/