diff --git a/www/cblog/Makefile b/www/cblog/Makefile
index 3e07f2fbbc7a..5efa763d0736 100644
--- a/www/cblog/Makefile
+++ b/www/cblog/Makefile
@@ -1,39 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	cblog
 PORTVERSION=	0.1.6
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://files.etoilebsd.net/cblog/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Simple weblog in C using markdown
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:${PORTSDIR}/www/clearsilver \
 		${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
-LIB_DEPENDS=	fcgi:${PORTSDIR}/www/fcgi
+LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
 
 LICENSE=	BSD
 
 USE_RC_SUBR=	cblog
 
-PLIST_FILES=	libexec/cblog.fcgi \
-		bin/cblogctl \
-		etc/cblog.conf.sample
-
-MAN1=		cblog.fcgi.1
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s#^INCLUDES=.*#INCLUDES=-I${LOCALBASE}/include#g" \
 		-e "s#^LIBDIR=.*#LIBDIR=-L${LOCALBASE}/lib#g" \
 		-e "s#^CSINCLUDES=.*#CSINCLUDES=-I${LOCALBASE}/include/ClearSilver#g" \
 		${WRKSRC}/config.mk
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cblog.cgi ${PREFIX}/libexec/cblog.fcgi
-	${INSTALL_PROGRAM} ${WRKSRC}/cblogctl ${PREFIX}/bin/cblogctl
-	${INSTALL_DATA} ${WRKSRC}/samples/cblog.conf ${PREFIX}/etc/cblog.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/cgi/cblog.cgi.1 ${MANPREFIX}/man/man1/cblog.fcgi.1
+	${INSTALL_PROGRAM} ${WRKSRC}/cblog.cgi ${STAGEDIR}${PREFIX}/libexec/cblog.fcgi
+	${INSTALL_PROGRAM} ${WRKSRC}/cblogctl ${STAGEDIR}${PREFIX}/bin/cblogctl
+	${INSTALL_DATA} ${WRKSRC}/samples/cblog.conf ${STAGEDIR}${PREFIX}/etc/cblog.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/cgi/cblog.cgi.1 ${STAGEDIR}${MANPREFIX}/man/man1/cblog.fcgi.1
 
 .include <bsd.port.mk>
diff --git a/www/cblog/pkg-plist b/www/cblog/pkg-plist
new file mode 100644
index 000000000000..aa6e717d4b53
--- /dev/null
+++ b/www/cblog/pkg-plist
@@ -0,0 +1,4 @@
+bin/cblogctl
+etc/cblog.conf.sample
+libexec/cblog.fcgi
+man/man1/cblog.fcgi.1.gz