diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 2752b1d4d83b..2519f3c658f9 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.6 2009/07/21 16:00:19 brook Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/22 20:57:47 wiz Exp $
 #
 
-DISTNAME=	tesseract-2.03
+DISTNAME=	tesseract-2.04
 CATEGORIES=	graphics
 MASTER_SITES=	http://tesseract-ocr.googlecode.com/files/
 DISTFILES+=	${DISTNAME}.tar.gz
 .for l in deu eng fra ita nld spa
-DISTFILES+=	tesseract-2.00.$l.tar.gz
+DISTFILES+=	tesseract-2.00.${l}.tar.gz
 .endfor
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/tesseract-ocr/
 COMMENT=	Commercial quality open source OCR engine
+LICENSE=	apache-2.0
 
-PKG_DESTDIR_SUPPORT=user-destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	libexec share/doc/tesseract share/tesseract
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
@@ -27,14 +29,12 @@ post-build:
 		> ${WRKSRC}/tesseract.sh
 
 post-install:
-	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec
 	${MV} ${DESTDIR}${PREFIX}/bin/tesseract ${DESTDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKSRC}/tesseract.sh ${DESTDIR}${PREFIX}/bin/tesseract
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/tesseract
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/tesseract
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/tesseract
 	${INSTALL_DATA} ${WRKSRC}/phototest.tif ${DESTDIR}${PREFIX}/share/tesseract
 	cd ${WRKDIR}/tessdata && ${PAX} -rw * ${DESTDIR}${PREFIX}/share/tessdata
+	chmod a-x ${DESTDIR}${PREFIX}/share/tessdata/*.*
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tesseract/PLIST b/graphics/tesseract/PLIST
index 5a2cdf591a37..8dd4d79f7ba8 100644
--- a/graphics/tesseract/PLIST
+++ b/graphics/tesseract/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:59:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/07/22 20:57:47 wiz Exp $
 bin/cntraining
 bin/mftraining
 bin/tesseract
@@ -273,6 +273,7 @@ libexec/tesseract
 share/doc/tesseract/README
 share/tessdata/configs/api_config
 share/tessdata/configs/box.train
+share/tessdata/configs/box.train.stderr
 share/tessdata/configs/inter
 share/tessdata/configs/kannada
 share/tessdata/configs/makebox
diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo
index 01ddc0d64d58..49190cd62b3a 100644
--- a/graphics/tesseract/distinfo
+++ b/graphics/tesseract/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2009/07/21 16:00:19 brook Exp $
+$NetBSD: distinfo,v 1.7 2009/07/22 20:57:47 wiz Exp $
 
 SHA1 (tesseract-2.00.deu.tar.gz) = d8d89e2681421a144f3a1ec61ee0c530686f5096
 RMD160 (tesseract-2.00.deu.tar.gz) = c7e6755e94084114fb1a1be8e9308c8dddd2fdda
@@ -18,7 +18,6 @@ Size (tesseract-2.00.nld.tar.gz) = 1408071 bytes
 SHA1 (tesseract-2.00.spa.tar.gz) = 49206b79407cb23bc23b1cd95bee02544f2fcf9b
 RMD160 (tesseract-2.00.spa.tar.gz) = 0e1fcb5739b95d4131efeea440d353f5638bb57d
 Size (tesseract-2.00.spa.tar.gz) = 1365863 bytes
-SHA1 (tesseract-2.03.tar.gz) = b7859278ff98a8b64bf98b5a519688e1559cec57
-RMD160 (tesseract-2.03.tar.gz) = 7519e7f4d876444bd3264d599dbf423e22443311
-Size (tesseract-2.03.tar.gz) = 1075509 bytes
-SHA1 (patch-aa) = 6edb250b22714ffec9490602fe11cd2b284ba4bb
+SHA1 (tesseract-2.04.tar.gz) = 850c42c92a4471c5f41d4384c57045e812fde26a
+RMD160 (tesseract-2.04.tar.gz) = 826718ddf491c8b925b02c343d4a4992fd4631d8
+Size (tesseract-2.04.tar.gz) = 1118386 bytes
diff --git a/graphics/tesseract/patches/patch-aa b/graphics/tesseract/patches/patch-aa
deleted file mode 100644
index f25da73a7462..000000000000
--- a/graphics/tesseract/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/05/30 13:06:26 wiz Exp $
-
---- viewer/svutil.cpp.orig	2008-04-22 00:07:25.000000000 +0000
-+++ viewer/svutil.cpp
-@@ -31,6 +31,9 @@
- #include <signal.h>
- #include <netdb.h>
- #include <sys/socket.h>
-+#ifdef __NetBSD__
-+#include <netinet/in.h>
-+#endif
- #ifdef __linux__
- #include <sys/prctl.h>
- #endif