diff --git a/textproc/libtextcat/Makefile b/textproc/libtextcat/Makefile
index 6b2931cef247..0b74894132d2 100644
--- a/textproc/libtextcat/Makefile
+++ b/textproc/libtextcat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libtextcat
 PORTVERSION=	2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	http://software.wise-guys.nl/download/
 
@@ -13,17 +13,13 @@ COMMENT=	Language guessing by N-Gram-Based Text Categorization
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
+USES=		libtool
 USE_LDCONFIG=	yes
 
-PORTDOCS=	LICENSE README TODO
+OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.if exists(${PREFIX}/lib/libtextcat.a)
-CONFLICTS_INSTALL=	libexttextcat*
-.endif
+PORTDOCS=	README TODO
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/textcat.h ${STAGEDIR}${PREFIX}/include/
@@ -32,10 +28,8 @@ post-install:
 	(cd ${WRKSRC}/langclass/LM &&		\
 	${FIND} . -name "*.lm" -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/LM/{}" \;)
 	${INSTALL_DATA} ${WRKSRC}/langclass/conf.txt "${STAGEDIR}${DATADIR}"
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 regression-test:
 	(cd ${WRKSRC}/langclass/ &&		\
@@ -44,4 +38,4 @@ regression-test:
 	../src/testtextcat conf.txt < $$t ;	\
 	done)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/libtextcat/pkg-plist b/textproc/libtextcat/pkg-plist
index a5eec011730a..001c06a2a00f 100644
--- a/textproc/libtextcat/pkg-plist
+++ b/textproc/libtextcat/pkg-plist
@@ -8,9 +8,9 @@ include/libtextcat/utf8misc.h
 include/libtextcat/wg_mempool.h
 include/textcat.h
 lib/libtextcat.a
-lib/libtextcat.la
 lib/libtextcat.so
 lib/libtextcat.so.0
+lib/libtextcat.so.0.0.0
 %%DATADIR%%/LM/afrikaans.lm
 %%DATADIR%%/LM/albanian.lm
 %%DATADIR%%/LM/amharic-utf.lm