diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index 5cd82c3ce24..1d4e0985e77 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -1,12 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2009/08/10 06:31:44 kili Exp $
+# $OpenBSD: Makefile,v 1.5 2009/10/26 14:14:14 landry Exp $
 
 COMMENT =	simple and fast image viewer for X
 
-DISTNAME =	gpicview-0.1.11
-PKGNAME=	${DISTNAME}p0
+DISTNAME =	gpicview-0.2.1
 
 CATEGORIES =	graphics x11
 
+MAINTAINER =	Stephan A. Rickauer <stephan.rickauer@startek.ch>
+
 HOMEPAGE =	http://lxde.org/
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
@@ -27,10 +28,15 @@ MODULES =	devel/gettext
 
 LIB_DEPENDS =	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
 RUN_DEPENDS =	:desktop-file-utils-*:devel/desktop-file-utils
+MODULES +=      textproc/intltool
 
+USE_GMAKE =	yes
 USE_X11 =	yes
 USE_LIBTOOL =	yes
 
+# regress tests in po dir are broken
+NO_REGRESS =	yes
+
 CONFIGURE_STYLE = gnu
 
 CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gpicview/distinfo b/graphics/gpicview/distinfo
index 744ff2c9f5f..d05bffb6890 100644
--- a/graphics/gpicview/distinfo
+++ b/graphics/gpicview/distinfo
@@ -1,5 +1,5 @@
-MD5 (gpicview-0.1.11.tar.gz) = nVKl2XDzBXl4uY/lEbVRIQ==
-RMD160 (gpicview-0.1.11.tar.gz) = yUtb6In2WbMsngeDNE8cu8i1w4U=
-SHA1 (gpicview-0.1.11.tar.gz) = xGqXwxqE4SmUSgjw4vcC4aiXKFs=
-SHA256 (gpicview-0.1.11.tar.gz) = VYfDs6ee8MHH7PwTJ35Cp6+YUP34Qq81hWFuqJclumM=
-SIZE (gpicview-0.1.11.tar.gz) = 394506
+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
diff --git a/graphics/gpicview/pkg/PLIST b/graphics/gpicview/pkg/PLIST
index eda3ccd9a7d..521b293305c 100644
--- a/graphics/gpicview/pkg/PLIST
+++ b/graphics/gpicview/pkg/PLIST
@@ -1,30 +1,69 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/01/07 22:12:08 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/10/26 14:14:14 landry Exp $
 @bin bin/gpicview
 share/applications/gpicview.desktop
 share/gpicview/
 share/gpicview/pixmaps/
-share/gpicview/pixmaps/clockwise.png
-share/gpicview/pixmaps/counterclockwise.png
-share/gpicview/pixmaps/fullscreen.png
+share/gpicview/pixmaps/object-flip-horizontal.png
+share/gpicview/pixmaps/object-flip-vertical.png
+share/gpicview/pixmaps/object-rotate-left.png
+share/gpicview/pixmaps/object-rotate-right.png
+share/gpicview/ui/
+share/gpicview/ui/pref-dlg.ui
+share/locale/af/
+share/locale/af/LC_MESSAGES/
+share/locale/af/LC_MESSAGES/gpicview.mo
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+share/locale/ar/LC_MESSAGES/gpicview.mo
 share/locale/cs/LC_MESSAGES/gpicview.mo
-share/locale/de_DE/
-share/locale/de_DE/LC_MESSAGES/
-share/locale/de_DE/LC_MESSAGES/gpicview.mo
+share/locale/da/LC_MESSAGES/gpicview.mo
+share/locale/de/LC_MESSAGES/gpicview.mo
 share/locale/es/LC_MESSAGES/gpicview.mo
+share/locale/et/LC_MESSAGES/gpicview.mo
 share/locale/eu/LC_MESSAGES/gpicview.mo
+share/locale/fa/
+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/gl/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
+share/locale/it/LC_MESSAGES/gpicview.mo
 share/locale/ja/LC_MESSAGES/gpicview.mo
+share/locale/ko/LC_MESSAGES/gpicview.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/gpicview.mo
+share/locale/ml/
+share/locale/ml/LC_MESSAGES/
+share/locale/ml/LC_MESSAGES/gpicview.mo
+share/locale/ms/
+share/locale/ms/LC_MESSAGES/
+share/locale/ms/LC_MESSAGES/gpicview.mo
+share/locale/nb/LC_MESSAGES/gpicview.mo
 share/locale/nl/LC_MESSAGES/gpicview.mo
-share/locale/no/LC_MESSAGES/gpicview.mo
+share/locale/nn/LC_MESSAGES/gpicview.mo
 share/locale/pl/LC_MESSAGES/gpicview.mo
+share/locale/ps/
+share/locale/ps/LC_MESSAGES/
+share/locale/ps/LC_MESSAGES/gpicview.mo
+share/locale/pt/LC_MESSAGES/gpicview.mo
 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/sv/LC_MESSAGES/gpicview.mo
+share/locale/tr/LC_MESSAGES/gpicview.mo
+share/locale/uk/LC_MESSAGES/gpicview.mo
+share/locale/ur/
+share/locale/ur/LC_MESSAGES/
+share/locale/ur/LC_MESSAGES/gpicview.mo
+share/locale/ur_PK/
+share/locale/ur_PK/LC_MESSAGES/
+share/locale/ur_PK/LC_MESSAGES/gpicview.mo
+share/locale/vi/LC_MESSAGES/gpicview.mo
 share/locale/zh_CN/LC_MESSAGES/gpicview.mo
 share/locale/zh_TW/LC_MESSAGES/gpicview.mo
 share/pixmaps/