diff --git a/x11-toolkits/libxaw3dxft/Makefile b/x11-toolkits/libxaw3dxft/Makefile
index b9076ca79eb9..b7dc43ca088e 100644
--- a/x11-toolkits/libxaw3dxft/Makefile
+++ b/x11-toolkits/libxaw3dxft/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libxaw3dxft
 DISTVERSION=	1.6.2c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/sf-xpaint/${PORTNAME}
 DISTNAME=	libXaw3dXft-${DISTVERSION}
@@ -12,9 +12,8 @@ COMMENT=	3D Xaw (Athena Widget Set) replacement with extended fonts
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		pkgconfig
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_XORG=	xft xmu xpm
 
@@ -26,8 +25,6 @@ DOCSDIR=	${LOCALBASE}/share/doc/libXaw3dXft
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} '/^pkgconfigdir/s:=.*:= ${PREFIX}/libdata/pkgconfig:'\
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} '/^typedef.*Pixel;/d' ${WRKSRC}/src/Xaw3dXft.c
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libxaw3dxft/pkg-plist b/x11-toolkits/libxaw3dxft/pkg-plist
index 588e27441d04..9ab1b3430b7e 100644
--- a/x11-toolkits/libxaw3dxft/pkg-plist
+++ b/x11-toolkits/libxaw3dxft/pkg-plist
@@ -1,7 +1,3 @@
-lib/libXaw3dxft.a
-lib/libXaw3dxft.la
-lib/libXaw3dxft.so
-lib/libXaw3dxft.so.8
 include/X11/Xaw3dxft/AllWidgets.h
 include/X11/Xaw3dxft/AsciiSink.h
 include/X11/Xaw3dxft/AsciiSinkP.h
@@ -78,5 +74,9 @@ include/X11/Xaw3dxft/VendorEP.h
 include/X11/Xaw3dxft/Xaw3dP.h
 include/X11/Xaw3dxft/Xaw3dXft.h
 include/X11/Xaw3dxft/XawImP.h
+lib/libXaw3dxft.a
+lib/libXaw3dxft.so
+lib/libXaw3dxft.so.8
+lib/libXaw3dxft.so.8.0.2
 libdata/pkgconfig/libxaw3dxft.pc
 @dirrm include/X11/Xaw3dxft