diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile
index 96901103180e..8311bdc1e755 100644
--- a/www/cplanet/Makefile
+++ b/www/cplanet/Makefile
@@ -1,34 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	cplanet
 PORTVERSION=	0.9
 PORTREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	http://files.etoilebsd.net/cplanet/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	RSS Feed Aggregator that generate static html
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:${PORTSDIR}/www/clearsilver
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 LICENSE=	BSD
 
-MAN1=		cplanet.1
-
 OPTIONS_DEFINE=	EXAMPLES
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${MANPREFIX}/man/man1
+
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL} -o root -g wheel -m 644 ${WRKSRC}/samples/cplanet-atom.cs ${EXAMPLESDIR}
-	${INSTALL} -o root -g wheel -m 644 ${WRKSRC}/samples/cplanet-opml.cs ${EXAMPLESDIR}
-	${INSTALL} -o root -g wheel -m 644 ${WRKSRC}/samples/cplanet-rss.cs ${EXAMPLESDIR}
-	${INSTALL} -o root -g wheel -m 644 ${WRKSRC}/samples/cplanet.cs ${EXAMPLESDIR}
-	${INSTALL} -o root -g wheel -m 644 ${WRKSRC}/samples/cplanet.hdf ${EXAMPLESDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/cplanet-atom.cs \
+		${WRKSRC}/samples/cplanet-opml.cs \
+		${WRKSRC}/samples/cplanet-rss.cs \
+		${WRKSRC}/samples/cplanet.cs \
+		${WRKSRC}/samples/cplanet.hdf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/cplanet/pkg-plist b/www/cplanet/pkg-plist
index de70e3765405..3e44be409a06 100644
--- a/www/cplanet/pkg-plist
+++ b/www/cplanet/pkg-plist
@@ -1,7 +1,8 @@
 bin/cplanet
+man/man1/cplanet.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cplanet-atom.cs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cplanet-opml.cs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cplanet-rss.cs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cplanet.cs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cplanet.hdf
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%