diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index d0189fcbd7a..620752c4233 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2008/09/18 13:37:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2008/09/24 16:30:43 ajacoutot Exp $
 
 COMMENT=	scanner frontend for SANE
 
-DISTNAME=	xsane-0.995
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	xsane-0.996
 CATEGORIES=	graphics
 
 MASTER_SITES=	ftp://ftp.sane-project.org/pub/sane/xsane/ \
@@ -33,6 +32,7 @@ MODULES=	devel/gettext
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		lcms.>=1::graphics/lcms \
 		sane.>=1::graphics/sane-backends
+RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
@@ -40,7 +40,7 @@ CONFIGURE_STYLE=gnu
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libpng" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+		LDFLAGS="-L${LOCALBASE}/lib -liconv" \
 		gt_cv_func_gettext_libintl=yes
 
 NO_REGRESS=	Yes
@@ -49,7 +49,8 @@ FLAVORS=	gimp
 FLAVOR?=
 
 .if ${FLAVOR:L} == "gimp"
-LIB_DEPENDS+=	gimp-2.0.>=200.0,gimpmodule-2.0,gimpui-2.0,gimpmath-2.0,gimpwidgets-2.0,gimpbase-2.0,gimpcolor-2.0::graphics/gimp/stable
+WANTLIB+=	gthread-2.0
+LIB_DEPENDS+=	gimp-2.0.>=200.0,gimpmodule-2.0,gimpui-2.0,gimpmath-2.0,gimpwidgets-2.0,gimpbase-2.0,gimpcolor-2.0,gimpconfig-2.0::graphics/gimp/stable
 CONFIGURE_ENV+=	CPPFLAGS+="-I${LOCALBASE}/include/gimp-2.0"
 .else
 CONFIGURE_ARGS+=--disable-gimp
diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo
index ce80d026e63..29125b1358f 100644
--- a/graphics/xsane/distinfo
+++ b/graphics/xsane/distinfo
@@ -1,5 +1,5 @@
-MD5 (xsane-0.995.tar.gz) = Wq7bdZc8OxOxNu3scU4/6A==
-RMD160 (xsane-0.995.tar.gz) = iJ9AWM5l8AfPFIKQHSUnSOOHTeU=
-SHA1 (xsane-0.995.tar.gz) = nU6AUPW2EDTiCtu1z4i1Dj50QFA=
-SHA256 (xsane-0.995.tar.gz) = ZqBCJTw1pUNhqMbEXEm3slC9RaAkxEmANnP8MecqNAs=
-SIZE (xsane-0.995.tar.gz) = 3307923
+MD5 (xsane-0.996.tar.gz) = fcvN8OgzItfApUNnLZyi2A==
+RMD160 (xsane-0.996.tar.gz) = yScnSh0JqnTJX8KlX0SUsmGEDyM=
+SHA1 (xsane-0.996.tar.gz) = Lypwm1d0Y8xX1trOxKUwqMT+uMY=
+SHA256 (xsane-0.996.tar.gz) = pUsGc1tmm9GBWZJLkXX8sPwUULXVfVwKIzua40FWrX0=
+SIZE (xsane-0.996.tar.gz) = 3343648
diff --git a/graphics/xsane/patches/patch-src_Makefile_in b/graphics/xsane/patches/patch-src_Makefile_in
index af891e10f18..7c0a6262249 100644
--- a/graphics/xsane/patches/patch-src_Makefile_in
+++ b/graphics/xsane/patches/patch-src_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2006/10/20 17:54:45 ajacoutot Exp $
---- src/Makefile.in.orig	Sat Jan  7 00:22:47 2006
-+++ src/Makefile.in	Thu Sep 21 17:02:53 2006
+$OpenBSD: patch-src_Makefile_in,v 1.2 2008/09/24 16:30:43 ajacoutot Exp $
+--- src/Makefile.in.orig	Wed Sep 24 17:59:31 2008
++++ src/Makefile.in	Wed Sep 24 17:59:51 2008
 @@ -21,8 +21,8 @@ mandir = @mandir@
  includedir = @includedir@
  oldincludedir = /usr/include
@@ -9,6 +9,6 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2006/10/20 17:54:45 ajacoutot Exp $
 -xsanedocdir = ${datadir}/sane/xsane/doc
 +sanedatadir = ${datadir}
 +xsanedocdir = ${datadir}/doc/xsane
+ desktopappdir = @datadir@/applications
+ pixmapdir = @datadir@/pixmaps
  
- MKINSTALLDIRS = @MKINSTALLDIRS@
- INSTALL = @INSTALL@
diff --git a/graphics/xsane/pkg/PLIST b/graphics/xsane/pkg/PLIST
index 7ee331f34a1..c12e73a108a 100644
--- a/graphics/xsane/pkg/PLIST
+++ b/graphics/xsane/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/11/23 09:07:26 ajacoutot Exp $
-bin/xsane
+@comment $OpenBSD: PLIST,v 1.5 2008/09/24 16:30:43 ajacoutot Exp $
+@bin bin/xsane
 @man man/man1/xsane.1
+share/applications/xsane.desktop
 share/doc/xsane/
 share/doc/xsane/sane-backends-doc.html
 share/doc/xsane/sane-pnm-doc.html
@@ -171,6 +172,8 @@ share/locale/zh/
 share/locale/zh/LC_MESSAGES/
 share/locale/zh/LC_MESSAGES/xsane.mo
 share/locale/zh_CN/LC_MESSAGES/xsane.mo
+share/pixmaps/
+share/pixmaps/xsane.xpm
 share/xsane/
 share/xsane/Mustek-logo.xpm
 share/xsane/Plustek-logo.xpm
@@ -186,3 +189,5 @@ share/xsane/xsane-logo.xpm
 share/xsane/xsane-startimage.pnm
 share/xsane/xsane-style.rc
 %%gimp%%
+@exec %D/bin/update-desktop-database
+@unexec %D/bin/update-desktop-database