diff --git a/packaging/FreeBSD/recoll/Makefile b/packaging/FreeBSD/recoll/Makefile
index 007b0777..b273e33f 100644
--- a/packaging/FreeBSD/recoll/Makefile
+++ b/packaging/FreeBSD/recoll/Makefile
@@ -2,11 +2,11 @@
 # Date created:        5 December 2005
 # Whom:                J.F. Dockes <jean-francois.dockes@wanadoo.fr>
 #
-# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.15 2007/02/13 00:16:19 pav Exp $
+# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.21 2007/08/12 14:54:13 rafan Exp $
 #
 
 PORTNAME=	recoll
-PORTVERSION=	1.8.1
+PORTVERSION=	1.9.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 
@@ -14,7 +14,7 @@ MAINTAINER=	jean-francois.dockes@wanadoo.fr
 COMMENT=	A personal full text search package, based on QT and Xapian
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS=	xapian.13:${PORTSDIR}/databases/xapian-core \
+LIB_DEPENDS=	xapian.1[3-6]:${PORTSDIR}/databases/xapian-core \
 		qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
 
 USE_QT_VER=	3
@@ -34,10 +34,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's/^CXXFLAGS =/CXXFLAGS ?=/' \
 		${WRKSRC}/mk/localdefs.in
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=	doesn't build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/packaging/FreeBSD/recoll/distinfo b/packaging/FreeBSD/recoll/distinfo
index 36acf33e..eac8be01 100644
--- a/packaging/FreeBSD/recoll/distinfo
+++ b/packaging/FreeBSD/recoll/distinfo
@@ -1,3 +1,3 @@
-MD5 (recoll-1.8.1.tar.gz) = 4dc4b372a63ed16b27c6a731503afe2f
-SHA256 (recoll-1.8.1.tar.gz) = 9720f333e311bc0cab6d209030154a77492a49aca1c84eaf8062dc53e59823d7
-SIZE (recoll-1.8.1.tar.gz) = 824559
+MD5 (recoll-1.9.0.tar.gz) = f63ff5961fdf3ccfaaae177fb26a01b2
+SHA256 (recoll-1.9.0.tar.gz) = 2274e9e508d3d569f70ff2c41c683451e034a66579e1ac8fa98aae34b77c8a5a
+SIZE (recoll-1.9.0.tar.gz) = 841232
diff --git a/packaging/FreeBSD/recoll/pkg-plist b/packaging/FreeBSD/recoll/pkg-plist
index 9ea22928..eb3c5782 100644
--- a/packaging/FreeBSD/recoll/pkg-plist
+++ b/packaging/FreeBSD/recoll/pkg-plist
@@ -1,7 +1,7 @@
 bin/recoll
 bin/recollindex
 share/applications/recoll-searchgui.desktop
-share/icons/hicolor/48x48/apps/recoll-searchgui.png
+share/icons/hicolor/48x48/apps/recoll.png
 %%DATADIR%%/doc/docbook.css
 %%DATADIR%%/doc/usermanual.html
 %%DATADIR%%/examples/mimeconf
@@ -9,10 +9,14 @@ share/icons/hicolor/48x48/apps/recoll-searchgui.png
 %%DATADIR%%/examples/mimeview
 %%DATADIR%%/examples/rclmon.sh
 %%DATADIR%%/examples/recoll.conf
+%%DATADIR%%/filters/rclabw
 %%DATADIR%%/filters/rcldjvu
 %%DATADIR%%/filters/rcldoc
 %%DATADIR%%/filters/rcldvi
 %%DATADIR%%/filters/rclgaim
+%%DATADIR%%/filters/rclid3
+%%DATADIR%%/filters/rcljpeg
+%%DATADIR%%/filters/rclkwd
 %%DATADIR%%/filters/rcllyx
 %%DATADIR%%/filters/rclman
 %%DATADIR%%/filters/rclmedia
@@ -23,6 +27,7 @@ share/icons/hicolor/48x48/apps/recoll-searchgui.png
 %%DATADIR%%/filters/rclscribus
 %%DATADIR%%/filters/rclsoff
 %%DATADIR%%/filters/rcluncomp
+%%DATADIR%%/filters/rclwpd
 %%DATADIR%%/filters/rclxls
 %%DATADIR%%/filters/xdg-open
 %%DATADIR%%/images/document.png
@@ -43,6 +48,7 @@ share/icons/hicolor/48x48/apps/recoll-searchgui.png
 %%DATADIR%%/images/wordprocessing.png
 %%DATADIR%%/translations/recoll_fr.qm
 %%DATADIR%%/translations/recoll_it.qm
+%%DATADIR%%/translations/recoll_de.qm
 %%DATADIR%%/translations/recoll_uk.qm
 %%DATADIR%%/translations/recoll_ru.qm
 @dirrm %%DATADIR%%/doc
diff --git a/src/doc/user/bldloop b/src/doc/user/bldloop
new file mode 100644
index 00000000..f65ce21c
--- /dev/null
+++ b/src/doc/user/bldloop
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+while true;do 
+  make FORMATS=html
+  cp *.html /usr/local/www/lesbonscomptes/recoll/usermanual/
+  sleep 1
+done
diff --git a/tests/koi8r/koi8r.sh b/tests/koi8r/koi8r.sh
index 3ccad00a..c3d1d8d7 100755
--- a/tests/koi8r/koi8r.sh
+++ b/tests/koi8r/koi8r.sh
@@ -4,7 +4,9 @@ topdir=`dirname $0`/..
 . $topdir/shared.sh
 
 initvariables $0
-
+# The question is utf-8. As recollq will use the locale to translate the cmd
+# line, need an utf-8 locale
+export LANG=uk_UA.UTF-8
 recollq 'внешнии' > $mystdout 2> $mystderr
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
diff --git a/tests/shared.sh b/tests/shared.sh
index 484fadf1..158e0657 100644
--- a/tests/shared.sh
+++ b/tests/shared.sh
@@ -1,8 +1,8 @@
-# @(#$Id: shared.sh,v 1.3 2007-11-21 16:34:16 dockes Exp $  (C) 2006 J.F.Dockes
+# @(#$Id: shared.sh,v 1.4 2009-01-06 18:47:33 dockes Exp $  (C) 2006 J.F.Dockes
 
 # shared code and variables for all tests
 
-RECOLL_CONFDIR=/Users/dockes/projets/fulltext/testrecoll/config
+RECOLL_CONFDIR=/home/dockes/projets/fulltext/testrecoll/config
 export RECOLL_CONFDIR
 
 # Call this with the script's $0 as argument