Index: head/net-mgmt/riemann/Makefile
===================================================================
--- head/net-mgmt/riemann/Makefile	(revision 436103)
+++ head/net-mgmt/riemann/Makefile	(revision 436104)
@@ -1,62 +1,62 @@
 # Created by: Dave Cottlehuber <dch@skunkwerks.at>
 # $FreeBSD$
 
 PORTNAME=	riemann
 PORTVERSION=	0.2.12
+PORTREVISION=	1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
 
 MAINTAINER=	dch@skunkwerks.at
 COMMENT=	Monitors distributed systems
 
 LICENSE=	EPL
 
 USES=		tar:bzip2
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 
-SUB_FILES=	${PORTNAME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		RIEMANN_USER=${RIEMANN_USER} \
 		RIEMANN_GROUP=${RIEMANN_GROUP} \
 		RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
 		RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
 
 PLIST_SUB=	JAVA_HOME=${JAVA_HOME} \
 		RIEMANN_USER=${RIEMANN_USER} \
 		RIEMANN_GROUP=${RIEMANN_GROUP} \
 		RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
 		RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
 
 RIEMANN_USER?=	${PORTNAME}
 RIEMANN_GROUP?=	${PORTNAME}
 
 .if ${RIEMANN_USER} == "${PORTNAME}"
 USERS=	${PORTNAME}
 .endif
 .if ${RIEMANN_GROUP} == "${PORTNAME}"
 GROUPS=	${PORTNAME}
 .endif
 
 USE_RC_SUBR=	${PORTNAME}
 
 RIEMANN_LOGDIR=	/var/log/${PORTNAME}/
 RIEMANN_PIDFILE=	/var/run/${PORTNAME}.pid
 
 do-install:
 	${MKDIR} \
 		${STAGEDIR}${JAVAJARDIR} \
 		${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${ETCDIR}/conf.d \
 		${STAGEDIR}${RIEMANN_LOGDIR}
 	${INSTALL_DATA} \
 				${WRKSRC}/lib/${PORTNAME}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	${SED} -i -e "s:riemann.log:${RIEMANN_LOGDIR}${PORTNAME}.log:g" \
 		${WRKSRC}/etc/${PORTNAME}.config
 	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.config \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.config.sample
 
 .include <bsd.port.mk>
Index: head/net-mgmt/riemann/files/riemann.in
===================================================================
--- head/net-mgmt/riemann/files/riemann.in	(revision 436103)
+++ head/net-mgmt/riemann/files/riemann.in	(revision 436104)
@@ -1,76 +1,80 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: riemann
 # REQUIRE: LOGIN NETWORKING SERVERS
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # riemann_enable    (bool):   Set to NO by default.
 # Set it to YES to enable riemann.
 #
-# riemann_config    (string): Optional full path for riemann config file
-# riemann_user      (user):   Set to riemann by default.
-# riemann_group     (group):  Set to riemann by default.
-# riemann_jarfile   (string): Optional path to a custom jarfile.
-# riemann_java_home (args):   Specify which JVM to use, if not default.
-# riemann_min_mem   (num):    Minumum JVM heap size, 256m by default.
-# riemann_max_mem   (num):    Maximum JVM heap size, 1g by default.
-# riemann_java_opts (args):   Additional JVM properties or arguments.
+# riemann_config          (string): Optional full path for riemann config file
+# riemann_user            (user):   Set to riemann by default.
+# riemann_group           (group):  Set to riemann by default.
+# riemann_jarfile         (string): Optional path to a custom jarfile.
+# riemann_java_home       (args):   Specify which JVM to use, if not default.
+# riemann_java_classpath  (args):   Specify a custom Java ClassPath.
+# riemann_min_mem         (num):    Minumum JVM heap size, 256m by default.
+# riemann_max_mem         (num):    Maximum JVM heap size, 1g by default.
+# riemann_java_opts       (args):   Additional JVM properties or arguments.
+
 . /etc/rc.subr
 
 name="riemann"
 rcvar=riemann_enable
 
 load_rc_config $name
 
 : ${riemann_enable="NO"}
 : ${riemann_user:="%%RIEMANN_USER%%"}
 : ${riemann_group:="%%RIEMANN_GROUP%%"}
 : ${riemann_config:="%%PREFIX%%/etc/riemann/riemann.config.sample"}
 : ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"}
 : ${riemann_java_home:="%%JAVA_HOME%%"}
 : ${riemann_min_mem:="256m"}
 : ${riemann_max_mem:="1g"}
+: ${riemann_java_classpath:=${riemann_jarfile}}
 : ${riemann_java_opts:=" -server \
+	-cp ${riemann_java_classpath} \
         -Dapp=${name} \
         -Xms${riemann_min_mem} \
         -Xmx${riemann_max_mem} \
         -Xss256k \
         -Djava.awt.headless=true \
         -Djava.net.preferIPv4Stack=true \
         -XX:+AggressiveOpts \
         -XX:+CMSClassUnloadingEnabled \
         -XX:+CMSParallelRemarkEnabled \
         -XX:+DisableExplicitGC \
         -XX:+HeapDumpOnOutOfMemoryError \
         -XX:+UseCMSInitiatingOccupancyOnly \
         -XX:+UseCompressedOops \
         -XX:+UseConcMarkSweepGC \
         -XX:+UseFastAccessorMethods \
         -XX:+UseParNewGC \
         -XX:CMSInitiatingOccupancyFraction=75 "}
 
 pidfile="%%RIEMANN_PIDFILE%%"
 command="/usr/sbin/daemon"
 command_args="-f -t ${name} -c -r -P ${pidfile} \
     ${riemann_java_home}/bin/java \
     ${riemann_java_opts} \
-    -jar ${riemann_jarfile} ${riemann_config}"
+    riemann.bin start ${riemann_config}"
 required_files="${java_cmd} ${riemann_config}"
 
 riemann_prestart()
 {
     	install -o ${riemann_user} /dev/null ${pidfile}
 }
 start_precmd="${name}_prestart"
 
 # support SIGHUP to reload config file using pkill. parent pid
 # is that of daemon(8) and not of riemann's JVM instance
 extra_commands="reload"
 reload_cmd="pkill -SIGHUP -U ${riemann_user} -G ${riemann_group} -f Dapp=riemann"
 
 run_rc_command "$1"