Index: security/zeronet/Makefile
===================================================================
--- security/zeronet/Makefile	(revision 448269)
+++ security/zeronet/Makefile	(working copy)
@@ -4,6 +4,7 @@
 PORTNAME=	zeronet
 PORTVERSION=	0.5.7
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	yuri@rawbw.com
@@ -13,7 +14,8 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \
-		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent
+		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem
 
 SUB_FILES=	zeronet-service zeronet-cmd pkg-message
 SUB_LIST=	LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP}
@@ -27,22 +29,14 @@
 GH_PROJECT=	ZeroNet
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	TOR DEBUG
-TOR_DESC=	Enable TOR anonymity network integration
+OPTIONS_DEFINE=	DEBUG
 
-TOR_RUN_DEPENDS=tor:security/tor \
-		${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem
 DEBUG_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTOR}
-USER=		_tor
-GROUP=		_tor
-.else
 USER=		nobody
 GROUP=		nobody
-.endif
 
 do-build:
 	@(cd ${WRKSRC} && \
Index: security/zeronet/files/pkg-message.in
===================================================================
--- security/zeronet/files/pkg-message.in	(revision 448269)
+++ security/zeronet/files/pkg-message.in	(working copy)
@@ -16,10 +16,12 @@
 For example, to create a new ZeroNet site:
 # su -m %%USER%% zeronet siteCreate
 
-For Tor integration (recommended) please have these items:
-* option TOR=on in zeronet package
-* make sure %%LOCALBASE%%/etc/tor/torrc has "ControlPort 9051"
-* make sure tor service runs (service tor start)
+For Tor integration (recommended) please make sure:
+* Tor is installed:
+  # pkg install tor
+* %%LOCALBASE%%/etc/tor/torrc has "ControlPort 9051"
+* Tor service runs:
+  # service tor start
 * zeronet_args in /etc/rc.conf has "--tor enable" or "--tor always"
 
 Without the Tor integration, you need to make sure that your router