diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index a47a74242d16..7892b0bd4fde 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,33 +1,28 @@
 # New ports collection makefile for:   catdoc
-# Version required:    0.3
+# Version required:    0.90.1
 # Date created:        11 November 1997
 # Whom:                Brion Moss <brion@queeg.com>
 #
-# $Id: Makefile,v 1.4 1998/06/18 14:53:03 hoek Exp $
+# $Id: Makefile,v 1.5 1998/07/24 11:48:20 ache Exp $
 #
 
-DISTNAME=	catdoc-0.35
+DISTNAME=	catdoc-0.90.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.ice.ru/~vitus/works/
+MASTER_SITES=	ftp://ftp.ice.ru/pub/vitus/
 
 MAINTAINER=	brion@queeg.com
 
 MAN1=		catdoc.1
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-wish=/usr/local/bin/wish8.0
 
 .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R
 # Remove the below line to get Cyrillic code page support instead
 CFLAGS+=	-DLATIN1=1
 .endif
 
-# The wordview tcl/tk script is small and not required.  If the user
-# has tk, it will work.  It comes preset for tcl/tk-8.0, but works with tcl-76.
-
-do-build:
-	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o catdoc catdoc.c)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/catdoc ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/wordview ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/catdoc.1 ${PREFIX}/man/man1/catdoc.1
+# the author seems to have included some .o files for us ;-)
+pre-build:
+	@cd $(WRKSRC); $(MAKE) -k clean
 
 .include <bsd.port.mk>
diff --git a/textproc/catdoc/distinfo b/textproc/catdoc/distinfo
index ba42e73eeafc..6ec0ceb49d5a 100644
--- a/textproc/catdoc/distinfo
+++ b/textproc/catdoc/distinfo
@@ -1 +1 @@
-MD5 (catdoc-0.35.tar.gz) = fcc16fbc754df9b1140918bb6074fe71
+MD5 (catdoc-0.90.1.tar.gz) = bd0d54a68bfc8a6435da633f159f79f1
diff --git a/textproc/catdoc/pkg-descr b/textproc/catdoc/pkg-descr
index d20388b5ecb6..c217c37e2385 100644
--- a/textproc/catdoc/pkg-descr
+++ b/textproc/catdoc/pkg-descr
@@ -1,12 +1,15 @@
 This is a program for viewing MS Word documents.  It produces plain
 text output and can optionally convert non-standard characters into 
-TeX control sequences.  It does not work with MS Word 97 documents.
+TeX control sequences.  It works with MS Word 97 documents.
 
 There is also a cute little Tcl/Tk program included called wordview, which
 is basically a small GUI frontend to catdoc for viewing word documents.
 The wordview program works with Tcl 7.6 and up, but uses Tk 8.0 by default.
 
-http://www.ice.ru/~vitus/works/works_unix.html
+http://www.ice.ru/~vitus/catdoc/
 
 - Brion
 brion@queeg.com
+
+- Steve
+steve@farrell.org
diff --git a/textproc/catdoc/pkg-plist b/textproc/catdoc/pkg-plist
index 1cf634318580..ec84abb3e83b 100644
--- a/textproc/catdoc/pkg-plist
+++ b/textproc/catdoc/pkg-plist
@@ -1,2 +1,42 @@
 bin/catdoc
 bin/wordview
+lib/catdoc/8859-1.txt
+lib/catdoc/8859-2.txt
+lib/catdoc/8859-3.txt
+lib/catdoc/8859-4.txt
+lib/catdoc/8859-5.txt
+lib/catdoc/8859-6.txt
+lib/catdoc/8859-7.txt
+lib/catdoc/8859-8.txt
+lib/catdoc/8859-9.txt
+lib/catdoc/ascii.replchars
+lib/catdoc/ascii.specchars
+lib/catdoc/cp1250.txt
+lib/catdoc/cp1251.txt
+lib/catdoc/cp1252.txt
+lib/catdoc/cp1253.txt
+lib/catdoc/cp1254.txt
+lib/catdoc/cp1255.txt
+lib/catdoc/cp1256.txt
+lib/catdoc/cp1257.txt
+lib/catdoc/cp1258.txt
+lib/catdoc/cp437.txt
+lib/catdoc/cp850.txt
+lib/catdoc/cp852.txt
+lib/catdoc/cp855.txt
+lib/catdoc/cp857.txt
+lib/catdoc/cp860.txt
+lib/catdoc/cp861.txt
+lib/catdoc/cp862.txt
+lib/catdoc/cp863.txt
+lib/catdoc/cp864.txt
+lib/catdoc/cp865.txt
+lib/catdoc/cp866.txt
+lib/catdoc/cp869.txt
+lib/catdoc/cp874.txt
+lib/catdoc/koi8-r.txt
+lib/catdoc/tex.replchars
+lib/catdoc/tex.specchars
+lib/catdoc/us-ascii.txt
+lib/catdoc/x-mac-cyrillic.txt
+@dirrm lib/catdoc