diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index 62f1a9c8f337..59551b58cfe0 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.6.2
 PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://funkload.nuxeo.org/ \
-		http://cheeseshop.python.org/packages/source/f/funkload/
+		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -39,17 +39,17 @@ PLIST_SUB+=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
 		PYFUNKLOAD_EGG=${PYFUNKLOAD_EGG} \
 		PYFUNKLOAD_EGG_VER="${PORTNAME}==${PORTVERSION}"
 
-.if !defined(NOPORTDOCS)
 DOCSDIR=	${TARGETDIR}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${TARGETDIR}/share/examples/py-${PORTNAME}
-.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/funkload/demo ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/py-funkload/pkg-plist b/www/py-funkload/pkg-plist
index c8ea4032727e..b26f8aa30408 100644
--- a/www/py-funkload/pkg-plist
+++ b/www/py-funkload/pkg-plist
@@ -11,29 +11,29 @@ bin/fl-run-bench
 bin/fl-run-test
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/demo/README.txt
-%%EXAMPLESDIR%%/demo/cmf/Cmf.conf
-%%EXAMPLESDIR%%/demo/cmf/README.txt
-%%EXAMPLESDIR%%/demo/cmf/credential.conf
-%%EXAMPLESDIR%%/demo/cmf/groups.txt
-%%EXAMPLESDIR%%/demo/cmf/passwords.txt
-%%EXAMPLESDIR%%/demo/cmf/test_Cmf.py
-%%EXAMPLESDIR%%/demo/simple/README.txt
-%%EXAMPLESDIR%%/demo/simple/Simple.conf
-%%EXAMPLESDIR%%/demo/simple/monitor.conf
-%%EXAMPLESDIR%%/demo/simple/test_Simple.py
-%%EXAMPLESDIR%%/demo/xmlrpc/Credential.conf
-%%EXAMPLESDIR%%/demo/xmlrpc/Makefile
-%%EXAMPLESDIR%%/demo/xmlrpc/README.txt
-%%EXAMPLESDIR%%/demo/xmlrpc/cred.conf
-%%EXAMPLESDIR%%/demo/xmlrpc/monitor.conf
-%%EXAMPLESDIR%%/demo/xmlrpc/test_Credential.py
-%%EXAMPLESDIR%%/demo/zope/README.txt
-%%EXAMPLESDIR%%/demo/zope/Zope.conf
-%%EXAMPLESDIR%%/demo/zope/test_Zope.py
-@dirrm %%EXAMPLESDIR%%/demo/zope
-@dirrm %%EXAMPLESDIR%%/demo/xmlrpc
-@dirrm %%EXAMPLESDIR%%/demo/simple
-@dirrm %%EXAMPLESDIR%%/demo/cmf
-@dirrm %%EXAMPLESDIR%%/demo
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/cmf/Cmf.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/cmf/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/cmf/credential.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/cmf/groups.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/cmf/passwords.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/cmf/test_Cmf.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/simple/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/simple/Simple.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/simple/monitor.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/simple/test_Simple.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/xmlrpc/Credential.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/xmlrpc/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/xmlrpc/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/xmlrpc/cred.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/xmlrpc/monitor.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/xmlrpc/test_Credential.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/zope/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/zope/Zope.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/zope/test_Zope.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/zope
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/xmlrpc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/simple
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/cmf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%