diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 85178fbd84f..9b3f0d00f19 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=3.05.00
-revision=1
+revision=2
 wrksrc=tesseract-${version}
 _tessdata_ver=8bf2e7ad08db9ca174ae2b0b3a7498c9f1f71d40
 build_style=gnu-configure
@@ -34,14 +34,6 @@ post_extract() {
 	rmdir ${XBPS_BUILDDIR}/tessdata-${_tessdata_ver}
 }
 pre_configure() {
-	cd ${wrksrc}
-	# Some include paths are not set in training/Makefile.am
-#	sed -i training/Makefile.am \
-#		-e "/AM_CPPFLAGS += \\\\/a -I${XBPS_CROSS_BASE}/usr/include/glib-2.0 \\\\" \
-#		-e "/AM_CPPFLAGS += \\\\/a -I${XBPS_CROSS_BASE}/usr/lib/glib-2.0/include \\\\" \
-#		-e "/AM_CPPFLAGS += \\\\/a -I${XBPS_CROSS_BASE}/usr/include/pango-1.0 \\\\" \
-#		-e "/AM_CPPFLAGS += \\\\/a -I${XBPS_CROSS_BASE}/usr/include/cairo \\\\" \
-#		-e "/AM_CPPFLAGS += \\\\/a -I${XBPS_CROSS_BASE}/usr/include/freetype2 \\\\"
 	NOCONFIGURE=1 ./autogen.sh
 }
 post_build() {
@@ -63,32 +55,26 @@ tesseract-ocr-tools_package() {
 	pkg_install() {
 		local f
 		make DESTDIR=${PKGDESTDIR} training-install
-#		vmkdir usr/share/tesseract
-#		vmkdir usr/share/man/man1
-#		vmkdir usr/share/man/man5
-#		# Copy shell scripts
-#		for f in language-specific.sh tesstrain.sh tesstrain_utils.sh; do
-#			if [ -e ${wrksrc}/training/${f} ]; then
-#				cp -a ${wrksrc}/training/${f} \
-#					${PKGDESTDIR}/usr/share/tesseract
-#			fi
-#		done
-#		# Move binaries and manual pages
-#		for f in ambiguous_words classifier_tester cntraining combine_tessdata \
-#			dawg2wordlist mftraining set_unicharset_properties \
-#			shapeclustering text2image unicharambigs unicharset \
-#			unicharset_extractor wordlist2dawg; do
-#			if [ -e ${DESTDIR}/usr/bin/${f} ]; then
-#				mv ${DESTDIR}/usr/bin/${f} \
-#					${PKGDESTDIR}/usr/share/tesseract
-#			fi
-#			for n in 1 5; do
-#				if [ -e ${DESTDIR}/usr/share/man/man${n}/${f}.${n} ]; then
-#					mv ${DESTDIR}/usr/share/man/man${n}/${f}.${n} \
-#						${PKGDESTDIR}/usr/share/man/man${n}
-#				fi
-#			done
-#		done
+		vmkdir usr/share/tesseract
+		vmkdir usr/share/man/man1
+		vmkdir usr/share/man/man5
+		# Copy shell scripts
+		for f in language-specific.sh tesstrain.sh tesstrain_utils.sh; do
+			if [ -e ${wrksrc}/training/${f} ]; then
+				cp -a ${wrksrc}/training/${f} \
+					${PKGDESTDIR}/usr/share/tesseract
+			fi
+		done
+		# Move tool manual pages
+		for f in ambiguous_words cntraining combine_tessdata \
+			dawg2wordlist mftraining shapeclustering unicharambigs \
+			unicharset unicharset_extractor wordlist2dawg; do
+			for n in 1 5; do
+				if [ -e ${DESTDIR}/usr/share/man/man${n}/${f}.${n} ]; then
+					vmove usr/share/man/man${n}/${f}.${n}
+				fi
+			done
+		done
 	}
 }
 tesseract-ocr-devel_package() {