diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile
index 39d8dfa379e..e12b616c471 100644
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2009/07/18 21:37:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2009/08/12 15:23:56 ajacoutot Exp $
 
 COMMENT-main=	OCR software
 COMMENT-gui=	gocr tcl/tk frontend
 
-V=		0.44
+V=		0.48
 DISTNAME=	gocr-$V
 
 PKGNAME-main=	gocr-$V
-PKGNAME-gui=	gocr-gui-$Vp0
+PKGNAME-gui=	gocr-gui-$V
 
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jocr/}
@@ -32,7 +32,6 @@ FAKE_FLAGS+=	prefix=${PREFIX} exec_prefix=${PREFIX}
 MULTI_PACKAGES=	-main -gui
 
 MODULES=	x11/tk
-MODTK_VERSION=	8.4
 
 PKG_ARCH-gui=	*
 RUN_DEPENDS-gui=${MODTK_RUN_DEPENDS} \
@@ -43,9 +42,12 @@ RUN_DEPENDS-gui=${MODTK_RUN_DEPENDS} \
 WANTLIB-main=	c m
 LIB_DEPENDS-main=netpbm.>=0::graphics/netpbm
 
+post-extract:
+	rm ${WRKSRC}/src/barcode.c.orig
+
 pre-configure:
-	perl -pi -e 's,\@\@LOCALBASE\@\@,${LOCALBASE},g' \
-		${WRKSRC}/man/man1/gocr.1
+	${SUBST_CMD} ${WRKSRC}/man/man1/gocr.1 \
+		${WRKSRC}/bin/gocr.tcl
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gocr
diff --git a/graphics/gocr/distinfo b/graphics/gocr/distinfo
index 72f473cae1f..c2f643f7a2b 100644
--- a/graphics/gocr/distinfo
+++ b/graphics/gocr/distinfo
@@ -1,5 +1,5 @@
-MD5 (gocr-0.44.tar.gz) = hlfLBX14Nu0XG1cF1eCCyA==
-RMD160 (gocr-0.44.tar.gz) = 17ofR1QW8xwjYK66MPD/hnizmUM=
-SHA1 (gocr-0.44.tar.gz) = b5PLNz95B6n5uaxKR+eeDDbZKyM=
-SHA256 (gocr-0.44.tar.gz) = INdyTbTQpySt4rNqXpXzKaDhxGyXLwjBI7Z8Mxc7a08=
-SIZE (gocr-0.44.tar.gz) = 827497
+MD5 (gocr-0.48.tar.gz) = mIK6mpP8sYq3BKENqAwijA==
+RMD160 (gocr-0.48.tar.gz) = Efg56EPTVs6V+1wm9T0/VFppWTc=
+SHA1 (gocr-0.48.tar.gz) = IXL9BMVWtwsZ2ysqu8R3SfXQgTA=
+SHA256 (gocr-0.48.tar.gz) = 4Me2/IZKv+vLCvoISWP7mPiWezVpE+ZAbPeyHP2D2KI=
+SIZE (gocr-0.48.tar.gz) = 382555
diff --git a/graphics/gocr/patches/patch-bin_gocr_tcl b/graphics/gocr/patches/patch-bin_gocr_tcl
index c607dacc5ec..27cfaa31a9c 100644
--- a/graphics/gocr/patches/patch-bin_gocr_tcl
+++ b/graphics/gocr/patches/patch-bin_gocr_tcl
@@ -1,4 +1,4 @@
-$OpenBSD: patch-bin_gocr_tcl,v 1.1.1.1 2006/10/30 08:17:30 ajacoutot Exp $
+$OpenBSD: patch-bin_gocr_tcl,v 1.2 2009/08/12 15:23:56 ajacoutot Exp $
 --- bin/gocr.tcl.orig	Fri Feb  6 10:38:46 2004
 +++ bin/gocr.tcl	Fri Oct 27 10:35:15 2006
 @@ -9,7 +9,7 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-bin_gocr_tcl,v 1.1.1.1 2006/10/30 08:17:30 ajacoutot Exp $
  #
  # this is a multiline comment in wish, but not in sh \
 -exec wish -f $0 $@
-+exec wish8.4 -f $0 $@
++exec ${MODTK_BIN} -f $0 $@
  
  set ver 0.3.6
  set gocrver 0.3.5
diff --git a/graphics/gocr/patches/patch-man_man1_gocr_1 b/graphics/gocr/patches/patch-man_man1_gocr_1
index db8a5226f66..a7647bd339f 100644
--- a/graphics/gocr/patches/patch-man_man1_gocr_1
+++ b/graphics/gocr/patches/patch-man_man1_gocr_1
@@ -1,14 +1,14 @@
-$OpenBSD: patch-man_man1_gocr_1,v 1.1.1.1 2006/10/30 08:17:30 ajacoutot Exp $
---- man/man1/gocr.1.orig	Sun Oct 29 18:18:16 2006
-+++ man/man1/gocr.1	Sun Oct 29 18:19:25 2006
-@@ -146,8 +146,8 @@ This man page documents \fBgocr\fR, vers
+$OpenBSD: patch-man_man1_gocr_1,v 1.2 2009/08/12 15:23:56 ajacoutot Exp $
+--- man/man1/gocr.1.orig	Sun Mar 29 17:56:14 2009
++++ man/man1/gocr.1	Fri Aug  7 15:13:59 2009
+@@ -150,8 +150,8 @@ This man page documents \fBgocr\fR, version 0.41.
  .SH REPORTING BUGS
  Report bugs to Joerg Schulenburg
  .SH SEE ALSO
 -More details can be found at /usr/share/doc/gocr-\fBX.XX\fR/gocr.html.
 -Also read /usr/share/doc/gocr-\fBX.XX\fR/README to learn, how to improve
-+More details can be found at @@LOCALBASE@@/share/doc/gocr/gocr.html.
-+Also read @@LOCALBASE@@/share/doc/gocr/README to learn, how to improve
++More details can be found at ${LOCALBASE}/share/doc/gocr/gocr.html.
++Also read ${LOCALBASE}/share/doc/gocr/README to learn, how to improve
  results.
  .SH EXAMPLES
  .TP
diff --git a/graphics/gocr/patches/patch-src_pgm2asc_c b/graphics/gocr/patches/patch-src_pgm2asc_c
index d6ac6326849..02d6f00ae5d 100644
--- a/graphics/gocr/patches/patch-src_pgm2asc_c
+++ b/graphics/gocr/patches/patch-src_pgm2asc_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_pgm2asc_c,v 1.2 2007/03/17 22:03:30 espie Exp $
---- src/pgm2asc.c.orig	Wed Feb  7 23:34:41 2007
-+++ src/pgm2asc.c	Mon Mar 12 19:20:30 2007
-@@ -1721,7 +1721,7 @@ int glue_broken_chars( pix *pp ){
+$OpenBSD: patch-src_pgm2asc_c,v 1.3 2009/08/12 15:23:56 ajacoutot Exp $
+--- src/pgm2asc.c.orig	Mon Jul 27 14:53:43 2009
++++ src/pgm2asc.c	Fri Aug  7 15:13:59 2009
+@@ -1729,7 +1729,7 @@ int glue_broken_chars( pix *pp ){
    	  }
          } end_for_each(&(JOB->res.boxlist));
  	box4=box5; // next nearest box within the same line
diff --git a/graphics/gocr/pkg/PLIST-main b/graphics/gocr/pkg/PLIST-main
index b750eacd461..5b4c75506af 100644
--- a/graphics/gocr/pkg/PLIST-main
+++ b/graphics/gocr/pkg/PLIST-main
@@ -1,8 +1,6 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/20 19:49:51 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2009/08/12 15:23:56 ajacoutot Exp $
 @pkgpath graphics/gocr
-bin/gocr
-include/gocr.h
-lib/libPgm2asc.a
+@bin bin/gocr
 @man man/man1/gocr.1
 share/doc/gocr/
 share/doc/gocr/README