diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 9f9ba078c310..ce60f52c3274 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,46 +1,46 @@
 # Created by: Steven Wallace <swallace@FreeBSD.org>
 
 PORTNAME=	xpaint
 PORTVERSION=	2.9.10.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple paint program
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libopenjpeg.so:graphics/openjpeg15 \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2 \
 		libjbig.so:graphics/jbigkit \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libXaw3dxft.so:x11-toolkits/libxaw3dxft
 RUN_DEPENDS=	psselect:print/psutils \
 		bash:shells/bash
 
 GNU_CONFIGURE=	yes
-USES=		ghostscript:run jpeg libtool:build pkgconfig shebangfix \
-		tar:bzip2 xorg
-USE_XORG=	xft xmu xpm
+USES=		ghostscript:run jpeg libtool:build localbase:ldflags \
+		pkgconfig shebangfix tar:bzip2 xorg
+USE_XORG=	ice sm x11 xext xft xmu xpm xt
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/openjpeg-1.5
 MAKE_ENV+=	RM="${RM}"
 
 post-patch:
 	@${RM} ${WRKSRC}/XPaint.ad
 	@${REINPLACE_CMD} -e 's/-ldl //' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
 	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
 		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
 		${WRKSRC}/rw/Makefile.in
 	@${REINPLACE_CMD} -e '/if (!image)/s/return;/return -1;/' \
 		${WRKSRC}/rw/readWriteTGA.c
 
 post-configure:
 	${MAKE} -C ${WRKSRC} clean
 
 .include <bsd.port.mk>