diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index e1e614896d72..a91d5d39602d 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	viewvc
 PORTVERSION=	1.1.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.viewvc.org/ \
 		LOCAL/ohauer
@@ -39,12 +39,9 @@ MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-My
 
 .include <bsd.port.options.mk>
 
-USES=		cpe
-CPE_VENDOR=	viewvc
-CPE_PRODUCT=	viewvc
+USES=		cpe python:2.7
 NO_BUILD=	yes
 USE_RC_SUBR=	viewvc
-USE_PYTHON=	2
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \
@@ -65,6 +62,11 @@ post-patch:
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
 		${WRKSRC}/viewvc-install \
 		${WRKSRC}/bin/standalone.py
+# to much files, use own shebangfix	
+	${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \
+		| xargs ${REINPLACE_CMD} -i '' \
+		-e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \
+		-e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|'
 
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false)
diff --git a/devel/viewvc/files/pkg-message.in b/devel/viewvc/files/pkg-message.in
index d2932d5ed535..41fab98afee4 100644
--- a/devel/viewvc/files/pkg-message.in
+++ b/devel/viewvc/files/pkg-message.in
@@ -28,8 +28,7 @@
     AddHandler cgi-script .cgi
     Options NONE +ExecCGI
     DirectoryIndex viewvc.cgi
-    Order allow,deny
-    Allow from all
+    Require all granted
  </Directory>
 
 
diff --git a/devel/viewvc/pkg-plist b/devel/viewvc/pkg-plist
index 179de2d3c943..16d2b46a7b9f 100644
--- a/devel/viewvc/pkg-plist
+++ b/devel/viewvc/pkg-plist
@@ -241,36 +241,3 @@ viewvc/templates/revision.ezt
 viewvc/templates/roots.ezt
 viewvc/templates/rss.ezt
 @sample viewvc/viewvc.conf.sample
-@dirrm viewvc/bin/cgi
-@dirrm viewvc/bin/mod_python
-@dirrm viewvc/bin/wsgi
-@dirrm viewvc/bin
-@dirrm viewvc/lib/vcauth/forbidden
-@dirrm viewvc/lib/vcauth/forbiddenre
-@dirrm viewvc/lib/vcauth/svnauthz
-@dirrm viewvc/lib/vcauth
-@dirrm viewvc/lib/vclib/ccvs/rcsparse/test-data
-@dirrm viewvc/lib/vclib/ccvs/rcsparse
-@dirrm viewvc/lib/vclib/ccvs
-@dirrm viewvc/lib/vclib/svn
-@dirrm viewvc/lib/vclib
-@dirrm viewvc/lib
-@dirrm viewvc/templates/docroot/images
-@dirrm viewvc/templates/docroot
-@dirrm viewvc/templates/include
-@dirrm viewvc/templates
-@dirrm viewvc/templates-contrib/newvc/templates/docroot/images
-@dirrm viewvc/templates-contrib/newvc/templates/docroot
-@dirrm viewvc/templates-contrib/newvc/templates/include
-@dirrm viewvc/templates-contrib/newvc/templates
-@dirrm viewvc/templates-contrib/newvc
-@dirrm viewvc/templates-contrib/viewsvn/extras
-@dirrm viewvc/templates-contrib/viewsvn/screenshots
-@dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn
-@dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images
-@dirrm viewvc/templates-contrib/viewsvn/templates/docroot
-@dirrm viewvc/templates-contrib/viewsvn/templates/include
-@dirrm viewvc/templates-contrib/viewsvn/templates
-@dirrm viewvc/templates-contrib/viewsvn
-@dirrm viewvc/templates-contrib
-@dirrmtry viewvc