diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index a8a5bb1036a2..1ae9e834b675 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	udmsearch
-PORTVERSION= 	2.2.1b
+PORTVERSION= 	3.0.19
 CATEGORIES=	www databases
 MASTER_SITES=	http://mysearch.udm.net/Download/	\
 		ftp://ftp.izhcom.ru/pub/unix/UdmSearch/	\
@@ -19,11 +19,15 @@ MAN5=		indexer.conf.5
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--bindir=${PREFIX}/bin/udmsearch \
+CONFIGURE_ARGS=	--enable-charset-guesser \
+		--localstatedir=/var/udmsearch \
+		--sysconfdir=${PREFIX}/etc/udmsearch \
+		--bindir=${PREFIX}/libexec/udmsearch \
+		--sbindir=${PREFIX}/libexec/udmsearch \
 		--sysconfdir=${PREFIX}/etc/udmsearch
 
 .if defined(WITH_POSTGRESQL)
-LIB_DEPENDS=		pq.2:${PORTSDIR}/databases/postgresql
+LIB_DEPENDS=		pq.2:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=	--with-pgsql
 
 .elif defined(WITH_MSQL)
@@ -55,8 +59,8 @@ pre-install:
 
 post-install:
 	@cp -R ${WRKSRC}/create ${PREFIX}/etc/udmsearch
-	@strip ${PREFIX}/sbin/indexer
-	@strip ${PREFIX}/bin/udmsearch/search.cgi
+	@strip ${PREFIX}/libexec/udmsearch/indexer
+	@strip ${PREFIX}/libexec/udmsearch/search.cgi
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/udmsearch/distinfo b/www/udmsearch/distinfo
index a93b6926279d..9ead177f76b2 100644
--- a/www/udmsearch/distinfo
+++ b/www/udmsearch/distinfo
@@ -1 +1 @@
-MD5 (udmsearch-2.2.1b.tar.gz) = 8aab9985604c81e769eea40f465126ad
+MD5 (udmsearch-3.0.19.tar.gz) = 0983067f3065d1852443bf293f748bd4
diff --git a/www/udmsearch/files/patch-aa b/www/udmsearch/files/patch-aa
index c096e52436e7..899a23c76f8a 100644
--- a/www/udmsearch/files/patch-aa
+++ b/www/udmsearch/files/patch-aa
@@ -1,6 +1,7 @@
---- doc/Makefile.in.orig	Thu Dec  2 22:11:39 1999
-+++ doc/Makefile.in	Thu Dec  2 22:12:27 1999
-@@ -261,9 +261,9 @@
+diff -ru ../udmsearch-3.0.19/doc/Makefile.in ./doc/Makefile.in
+--- ../udmsearch-3.0.19/doc/Makefile.in	Thu Jun 15 10:27:15 2000
++++ ./doc/Makefile.in	Sat Jul  8 15:09:00 2000
+@@ -273,9 +273,9 @@
  
  
  install-data-local:
@@ -11,5 +12,5 @@
 +	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/share/doc/udmsearch
 +	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/share/doc/udmsearch
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ dist-hook:
+ 	cp -rf samples $(distdir)
diff --git a/www/udmsearch/pkg-plist b/www/udmsearch/pkg-plist
index feda52c81dee..7add4254fa0a 100644
--- a/www/udmsearch/pkg-plist
+++ b/www/udmsearch/pkg-plist
@@ -1,42 +1,88 @@
-bin/udmsearch/search.cgi
 etc/udmsearch/indexer.conf-dist
 etc/udmsearch/search.htm-dist
-etc/udmsearch/create/msql/create.txt
-etc/udmsearch/create/mssql/create.txt
-etc/udmsearch/create/mysql/alter19-20.txt
-etc/udmsearch/create/mysql/alter20-21.txt
-etc/udmsearch/create/mysql/create.txt
-etc/udmsearch/create/mysql/drop.txt
-etc/udmsearch/create/pgsql/create.txt
-etc/udmsearch/create/odbc-mysql/create.txt
-etc/udmsearch/create/odbc-pgsql/create.txt
-etc/udmsearch/create/solid/README
-etc/udmsearch/create/solid/create.txt
-etc/udmsearch/create/stopwords/stop.cz.txt
-etc/udmsearch/create/stopwords/stop.de.txt
-etc/udmsearch/create/stopwords/stop.en.txt
-etc/udmsearch/create/stopwords/stop.es.txt
-etc/udmsearch/create/stopwords/stop.fr.txt
-etc/udmsearch/create/stopwords/stop.it.txt
-etc/udmsearch/create/stopwords/stop.nl.txt
-etc/udmsearch/create/stopwords/stop.no.txt
-etc/udmsearch/create/stopwords/stop.pt.txt
+etc/udmsearch/create/oracle/create.sql
+etc/udmsearch/create/oracle/multi.sql
+etc/udmsearch/create/sybase/create.sql
+etc/udmsearch/create/sybase/README
+etc/udmsearch/create/stopwords/stop.en.1.txt
 etc/udmsearch/create/stopwords/stop.ru.txt
+etc/udmsearch/create/stopwords/stop.pt.txt
+etc/udmsearch/create/stopwords/stop.no.txt
+etc/udmsearch/create/stopwords/stop.nl.txt
+etc/udmsearch/create/stopwords/stop.fr.txt
+etc/udmsearch/create/stopwords/stop.es.txt
+etc/udmsearch/create/stopwords/stop.en.txt
+etc/udmsearch/create/stopwords/stop.de.txt
+etc/udmsearch/create/stopwords/stop.it.txt
 etc/udmsearch/create/stopwords/stop.ua.txt
+etc/udmsearch/create/stopwords/stop.cz.txt
+etc/udmsearch/create/solid/create.txt
+etc/udmsearch/create/solid/README
+etc/udmsearch/create/solid/multi.txt
+etc/udmsearch/create/pgsql/create.txt
+etc/udmsearch/create/pgsql/crc.txt
+etc/udmsearch/create/pgsql/multi.txt
+etc/udmsearch/create/pgsql/crc-multi.txt
+etc/udmsearch/create/virtuoso/create.txt
+etc/udmsearch/create/virtuoso/multi.txt
+etc/udmsearch/create/virtuoso/crc.txt
+etc/udmsearch/create/mysql/create.txt
+etc/udmsearch/create/mysql/crc.txt
+etc/udmsearch/create/mysql/multi.txt
+etc/udmsearch/create/mysql/crc-multi.txt
+etc/udmsearch/create/mysql/ispell.txt
+etc/udmsearch/create/mssql/create.sql
+etc/udmsearch/create/msql/multi.txt
+etc/udmsearch/create/msql/create.txt
+etc/udmsearch/create/msql/crc.txt
+etc/udmsearch/create/msql/crc-multi.txt
+etc/udmsearch/create/ibase/create.sql
+include/udm_charset.h
+include/udm_common.h
+include/udm_conf.h
+include/udm_config.h
+include/udm_db.h
+include/udm_hrefs.h
+include/udm_indexer.h
+include/udm_log.h
+include/udm_mutex.h
+include/udm_os.h
+include/udm_parseurl.h
+include/udm_spell.h
+include/udm_utils.h
+include/udmsearch.h
+lib/libudmsearch.a
+libexec/udmsearch/search.cgi
+libexec/udmsearch/indexer
+libexec/udmsearch/udm-config
 share/doc/udmsearch/parsers.txt
 share/doc/udmsearch/syslog.txt
 share/doc/udmsearch/templates.txt
 share/doc/udmsearch/usage.txt
-sbin/indexer
-@dirrm bin/udmsearch
+share/doc/udmsearch/HTTP-codes.txt
+share/doc/udmsearch/HTDB.txt
+share/doc/udmsearch/search.txt
+share/doc/udmsearch/ispell.txt
+share/doc/udmsearch/follow.txt
+share/doc/udmsearch/storage.txt
+share/doc/udmsearch/hrefonly.txt
+share/doc/udmsearch/UdmSearch-Oracle8.html
+share/doc/udmsearch/NEWS.html
+share/doc/udmsearch/lib.txt
+share/doc/udmsearch/html.txt
+share/doc/udmsearch/charset.txt
+@dirrm share/doc/udmsearch
+@dirrm libexec/udmsearch
+@dirrm etc/udmsearch/create/ibase
 @dirrm etc/udmsearch/create/msql
 @dirrm etc/udmsearch/create/mssql
 @dirrm etc/udmsearch/create/mysql
+@dirrm etc/udmsearch/create/oracle
 @dirrm etc/udmsearch/create/pgsql
-@dirrm etc/udmsearch/create/odbc-mysql
-@dirrm etc/udmsearch/create/odbc-pgsql
 @dirrm etc/udmsearch/create/solid
 @dirrm etc/udmsearch/create/stopwords
+@dirrm etc/udmsearch/create/sybase
+@dirrm etc/udmsearch/create/virtuoso
 @dirrm etc/udmsearch/create
 @dirrm etc/udmsearch
-@dirrm share/doc/udmsearch
+@dirrm bin/udmsearch