Index: security/zeronet/Makefile
===================================================================
--- security/zeronet/Makefile	(revision 426192)
+++ security/zeronet/Makefile	(working copy)
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	zeronet
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	yuri@rawbw.com
@@ -18,7 +19,6 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	HelloZeroNet
 GH_PROJECT=	ZeroNet
-GH_TAGNAME=	523a7d4
 
 SUB_FILES=	zeronet-service zeronet-cmd pkg-message
 SUB_LIST=	LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP}
@@ -52,8 +52,9 @@
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${DATADIR}/
+	@${RM} `${FIND} ${STAGEDIR}${DATADIR} -name "*.orig"`
 	@${RM} `${FIND} ${STAGEDIR}${DATADIR} -name LICENSE`
-	@${RM} ${STAGEDIR}${DATADIR}/README.md ${STAGEDIR}${DATADIR}/requirements.txt
+	@${RM} ${STAGEDIR}${DATADIR}/README*.md ${STAGEDIR}${DATADIR}/CHANGELOG.md ${STAGEDIR}${DATADIR}/requirements.txt
 	@${RM} ${STAGEDIR}${DATADIR}/Vagrantfile ${STAGEDIR}${DATADIR}/Dockerfile
 	@${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -name test`
 	@${MKDIR} ${STAGEDIR}/var/db/zeronet
Index: security/zeronet/distinfo
===================================================================
--- security/zeronet/distinfo	(revision 426192)
+++ security/zeronet/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473177926
-SHA256 (HelloZeroNet-ZeroNet-0.4.0-523a7d4_GH0.tar.gz) = ec7004ecfbce36ad83e708161f5553b76bdb5b6fb2954aa2a04a391d6047c7cc
-SIZE (HelloZeroNet-ZeroNet-0.4.0-523a7d4_GH0.tar.gz) = 2384517
+TIMESTAMP = 1479544568
+SHA256 (HelloZeroNet-ZeroNet-v0.5.0_GH0.tar.gz) = a395a1cbb1b1c408596177b267f006926fdc5cae06490457e28db58693b3da59
+SIZE (HelloZeroNet-ZeroNet-v0.5.0_GH0.tar.gz) = 2411203
Index: security/zeronet/pkg-plist
===================================================================
--- security/zeronet/pkg-plist	(revision 426192)
+++ security/zeronet/pkg-plist	(working copy)
@@ -24,6 +24,12 @@
 %%DATADIR%%/plugins/CryptMessage/__init__.py
 %%DATADIR%%/plugins/CryptMessage/__init__.pyc
 %%DATADIR%%/plugins/CryptMessage/__init__.pyo
+%%DATADIR%%/plugins/MergerSite/MergerSitePlugin.py
+%%DATADIR%%/plugins/MergerSite/MergerSitePlugin.pyc
+%%DATADIR%%/plugins/MergerSite/MergerSitePlugin.pyo
+%%DATADIR%%/plugins/MergerSite/__init__.py
+%%DATADIR%%/plugins/MergerSite/__init__.pyc
+%%DATADIR%%/plugins/MergerSite/__init__.pyo
 %%DATADIR%%/plugins/Newsfeed/NewsfeedPlugin.py
 %%DATADIR%%/plugins/Newsfeed/NewsfeedPlugin.pyc
 %%DATADIR%%/plugins/Newsfeed/NewsfeedPlugin.pyo
@@ -30,6 +36,31 @@
 %%DATADIR%%/plugins/Newsfeed/__init__.py
 %%DATADIR%%/plugins/Newsfeed/__init__.pyc
 %%DATADIR%%/plugins/Newsfeed/__init__.pyo
+%%DATADIR%%/plugins/OptionalManager/ContentDbPlugin.py
+%%DATADIR%%/plugins/OptionalManager/ContentDbPlugin.pyc
+%%DATADIR%%/plugins/OptionalManager/ContentDbPlugin.pyo
+%%DATADIR%%/plugins/OptionalManager/OptionalManagerPlugin.py
+%%DATADIR%%/plugins/OptionalManager/OptionalManagerPlugin.pyc
+%%DATADIR%%/plugins/OptionalManager/OptionalManagerPlugin.pyo
+%%DATADIR%%/plugins/OptionalManager/Test/TestOptionalManager.py
+%%DATADIR%%/plugins/OptionalManager/Test/TestOptionalManager.pyc
+%%DATADIR%%/plugins/OptionalManager/Test/TestOptionalManager.pyo
+%%DATADIR%%/plugins/OptionalManager/Test/conftest.py
+%%DATADIR%%/plugins/OptionalManager/Test/conftest.pyc
+%%DATADIR%%/plugins/OptionalManager/Test/conftest.pyo
+%%DATADIR%%/plugins/OptionalManager/Test/pytest.ini
+%%DATADIR%%/plugins/OptionalManager/UiWebsocketPlugin.py
+%%DATADIR%%/plugins/OptionalManager/UiWebsocketPlugin.pyc
+%%DATADIR%%/plugins/OptionalManager/UiWebsocketPlugin.pyo
+%%DATADIR%%/plugins/OptionalManager/__init__.py
+%%DATADIR%%/plugins/OptionalManager/__init__.pyc
+%%DATADIR%%/plugins/OptionalManager/__init__.pyo
+%%DATADIR%%/plugins/PeerDb/PeerDbPlugin.py
+%%DATADIR%%/plugins/PeerDb/PeerDbPlugin.pyc
+%%DATADIR%%/plugins/PeerDb/PeerDbPlugin.pyo
+%%DATADIR%%/plugins/PeerDb/__init__.py
+%%DATADIR%%/plugins/PeerDb/__init__.pyc
+%%DATADIR%%/plugins/PeerDb/__init__.pyo
 %%DATADIR%%/plugins/Sidebar/SidebarPlugin.py
 %%DATADIR%%/plugins/Sidebar/SidebarPlugin.pyc
 %%DATADIR%%/plugins/Sidebar/SidebarPlugin.pyo
@@ -187,6 +218,12 @@
 %%DATADIR%%/src/Connection/__init__.py
 %%DATADIR%%/src/Connection/__init__.pyc
 %%DATADIR%%/src/Connection/__init__.pyo
+%%DATADIR%%/src/Content/ContentDb.py
+%%DATADIR%%/src/Content/ContentDb.pyc
+%%DATADIR%%/src/Content/ContentDb.pyo
+%%DATADIR%%/src/Content/ContentDbDict.py
+%%DATADIR%%/src/Content/ContentDbDict.pyc
+%%DATADIR%%/src/Content/ContentDbDict.pyo
 %%DATADIR%%/src/Content/ContentManager.py
 %%DATADIR%%/src/Content/ContentManager.pyc
 %%DATADIR%%/src/Content/ContentManager.pyo
@@ -334,6 +371,9 @@
 %%DATADIR%%/src/Test/TestTor.py
 %%DATADIR%%/src/Test/TestTor.pyc
 %%DATADIR%%/src/Test/TestTor.pyo
+%%DATADIR%%/src/Test/TestUpnpPunch.py
+%%DATADIR%%/src/Test/TestUpnpPunch.pyc
+%%DATADIR%%/src/Test/TestUpnpPunch.pyo
 %%DATADIR%%/src/Test/TestUser.py
 %%DATADIR%%/src/Test/TestUser.pyc
 %%DATADIR%%/src/Test/TestUser.pyo
@@ -768,6 +808,9 @@
 %%DATADIR%%/src/util/Platform.py
 %%DATADIR%%/src/util/Platform.pyc
 %%DATADIR%%/src/util/Platform.pyo
+%%DATADIR%%/src/util/Pooled.py
+%%DATADIR%%/src/util/Pooled.pyc
+%%DATADIR%%/src/util/Pooled.pyo
 %%DATADIR%%/src/util/QueryJson.py
 %%DATADIR%%/src/util/QueryJson.pyc
 %%DATADIR%%/src/util/QueryJson.pyo