diff --git a/graphics/libwmf-nox11/Makefile b/graphics/libwmf-nox11/Makefile
index 499602983c0d..d0d983cf0382 100644
--- a/graphics/libwmf-nox11/Makefile
+++ b/graphics/libwmf-nox11/Makefile
@@ -7,5 +7,4 @@ MASTERDIR=	${.CURDIR}/../libwmf
 OPTIONS_EXCLUDE=	X11
 OPTIONS_FILE_UNSET=	X11
 
-NO_STAGE=	yes
 .include        "${MASTERDIR}/Makefile"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index ef1a185e0756..2fd3937c4449 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tools and library for converting Microsoft WMF (windows metafile)
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	libxml2
@@ -28,9 +28,8 @@ USE_LDCONFIG=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFAULT=X11
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
@@ -55,10 +54,10 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
-		${TAR} -C ${DOCSDIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${DOCSDIR}
+		${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>