diff --git a/www/videocache/Makefile b/www/videocache/Makefile
index 5829117823e7..b56814d39650 100644
--- a/www/videocache/Makefile
+++ b/www/videocache/Makefile
@@ -4,10 +4,12 @@
 PORTNAME=	videocache
 PORTVERSION=	1.9.2
 CATEGORIES=	www
-MASTER_SITES=	http://cachevideos.com/sites/default/files/pub/videocache/
+MASTER_SITES=	http://secure.thrallingpenguin.com/hosting_files/ \
+		http://distcache.freebsd.org/ports-distfiles/ \
+		http://old.cachevideos.com/sites/default/files/pub/videocache/
 
 MAINTAINER=	mopsfelder@gmail.com
-COMMENT=	A Squid URL rewriter for bandwidth optimization
+COMMENT=	Squid URL rewriter for bandwidth optimization
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid \
 		${PYTHON_SITELIBDIR}/urlgrabber/grabber.py:${PORTSDIR}/www/py-urlgrabber \
@@ -16,36 +18,21 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid \
 NO_BUILD=	yes
 USE_PYTHON=	yes
 
-MAN8=		videocache.8.gz
 PORTDOCS=	CHANGELOG COPYING Readme
 PORTEXAMPLES=	squid.conf
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/update-vc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/videocache.8.gz ${MAN1PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/videocache-sysconfig.conf ${PREFIX}/etc/videocache.conf.default
-	@[ -f ${PREFIX}/etc/videocache.conf ] || \
-		${CP} -v ${PREFIX}/etc/videocache.conf.default ${PREFIX}/etc/videocache.conf
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/videocache/*.py ${DATADIR}
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/squid.conf.example ${EXAMPLESDIR}/squid.conf
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-. for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-. endfor
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/update-vc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/videocache.8.gz ${STAGEDIR}${MAN1PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/videocache-sysconfig.conf ${STAGEDIR}${PREFIX}/etc/videocache.conf.sample
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/videocache/*.py ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/squid.conf.example ${STAGEDIR}${EXAMPLESDIR}/squid.conf
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
+.endfor
 
-post-install:
-.if !defined(NOPORTEXAMPLES)
-	${CAT} ${PKGMESSAGE}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/videocache/pkg-descr b/www/videocache/pkg-descr
index 3d63e8ce932c..0d7dff602c15 100644
--- a/www/videocache/pkg-descr
+++ b/www/videocache/pkg-descr
@@ -4,4 +4,4 @@ sharing portals/websites like Youtube, Metacafe etc.
 It helps you save bandwidth when a particular video is
 requested more than once from the same network/machine.
 
-WWW:	http://www.cachevideos.com/
+WWW: http://www.cachevideos.com/
diff --git a/www/videocache/pkg-plist b/www/videocache/pkg-plist
index 90acf2ffbecb..84151e0360b6 100644
--- a/www/videocache/pkg-plist
+++ b/www/videocache/pkg-plist
@@ -1,10 +1,9 @@
 bin/update-vc
-@unexec if cmp -s %D/etc/videocache.conf %D/etc/videocache.conf.default; then rm -f %D/etc/videocache.conf; fi
-etc/videocache.conf.default
-@exec [ -f %B/videocache.conf ] || cp %B/%f %B/videocache.conf
+@sample etc/videocache.conf.sample
 %%DATADIR%%/Errors.py
 %%DATADIR%%/__init__.py
 %%DATADIR%%/config.py
 %%DATADIR%%/parser.py
 %%DATADIR%%/videocache.py
+man/man8/videocache.8.gz
 @dirrm %%DATADIR%%