Index: head/net-p2p/couchpotato/Makefile
===================================================================
--- head/net-p2p/couchpotato/Makefile	(revision 439444)
+++ head/net-p2p/couchpotato/Makefile	(revision 439445)
@@ -1,38 +1,41 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	couchpotato
 PORTVERSION=	0.0.20170327
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net-p2p python
 
-MAINTAINER=	feld@FreeBSD.org
+MAINTAINER=	joshruehlig@gmail.com
 COMMENT=	Automatic NZB and torrent downloader
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		fpc-libcurl>0:ftp/fpc-libcurl \
-		docbook-xml>0:textproc/docbook-xml
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
 
 USE_RC_SUBR=	couchpotato
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
+SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} USERS=${USERS}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-USES=		python shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	CouchPotato.py
 
 USERS=		couchpotato
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CouchPotato
 GH_PROJECT=	CouchPotatoServer
 GH_TAGNAME=	711310d
+
+OPTIONS_DEFINE=	UNRAR
+UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
Index: head/net-p2p/couchpotato/files/couchpotato.in
===================================================================
--- head/net-p2p/couchpotato/files/couchpotato.in	(revision 439444)
+++ head/net-p2p/couchpotato/files/couchpotato.in	(revision 439445)
@@ -1,50 +1,50 @@
 #!/bin/sh
 # $FreeBSD$
 #
 # PROVIDE: couchpotato
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable couchpotato:
 # couchpotato_enable:   Set to NO by default. Set it to YES to enable it.
 # couchpotato_user:     The user account CouchPotato daemon runs as what
 #                       you want it to be.
 # couchpotato_datadir:  Directory where CouchPotato user data lives.
 #                           Default: /var/db/couchpotato
 # couchpotato_conf:     Directory where CouchPotato user data lives.
 #                           Default: %%ETCDIR%%/settings.conf
 # couchpotato_flags:    Set additonal flags as needed.
 
 . /etc/rc.subr
 
 name=couchpotato
 rcvar=couchpotato_enable
 
 load_rc_config ${name}
 
 : ${couchpotato_enable:=NO}
-: ${couchpotato_user:=couchpotato}
+: ${couchpotato_user:=%%USERS%%}
 : ${couchpotato_datadir=/var/db/couchpotato}
 : ${couchpotato_conf=%%ETCDIR%%/settings.conf}
 
 pidfile=/var/run/couchpotato/couchpotato.pid
 command="%%DATADIR%%/CouchPotato.py"
 command_interpreter="%%PYTHON_CMD%%"
 command_args="--daemon --data_dir ${couchpotato_datadir} --pid_file ${pidfile} --config_file ${couchpotato_conf}"
 
 start_precmd=couch_pre
 
 couch_pre()
 {
 	if [ ! -d ${couchpotato_datadir} ]; then
 		install -d -o ${couchpotato_user} ${couchpotato_datadir}
 	fi
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${couchpotato_user} ${pidfile%/*}
 	fi
 	if [ ! -d ${couchpotato_conf%/*} ]; then
 		install -d -o ${couchpotato_user} ${couchpotato_conf%/*}
 	fi
 }
 
 run_rc_command "$1"