diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index a827e48b1b94..ae04f36be882 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	abiword
 PORTVERSION=	2.8.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 0cf961bf6f9e..fc79f44a10d1 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -3,30 +3,28 @@
 
 PORTNAME=	ots
 PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	SF/lib${PORTNAME}/lib${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Text Summarizer
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
 
+USES=		gettext libtool pathfix pkgconfig
+PATHFIX_MAKEFILEIN=	Makefile.am
+USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
+AUTOMAKE_ARGS=	-a -c -f
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
-USES=		gettext pkgconfig
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-shared
-MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 MAKE_JOBS_UNSAFE=yes
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
-
-post-build:
-	@${REINPLACE_CMD} -e '/old_library/d' ${WRKSRC}/src/libots-1.la
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '\|doc/Makefile|d' ${WRKSRC}/configure.in
 
 .include <bsd.port.mk>
diff --git a/textproc/ots/pkg-plist b/textproc/ots/pkg-plist
index 54117cc4e2b3..c2549c9dee32 100644
--- a/textproc/ots/pkg-plist
+++ b/textproc/ots/pkg-plist
@@ -1,8 +1,9 @@
 bin/ots
 include/libots-1/ots/libots.h
-lib/libots-1.la
+lib/libots-1.a
 lib/libots-1.so
-lib/libots-1.so.5
+lib/libots-1.so.0
+lib/libots-1.so.0.5.0
 libdata/pkgconfig/libots-1.pc
 %%DATADIR%%/bg.xml
 %%DATADIR%%/ca.xml