diff --git a/net-mgmt/rubygem-oxidized/Makefile b/net-mgmt/rubygem-oxidized/Makefile
index 917ef7c403f0..eda3f00a47f8 100644
--- a/net-mgmt/rubygem-oxidized/Makefile
+++ b/net-mgmt/rubygem-oxidized/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	oxidized
 DISTVERSION=	0.37.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	nick@foobar.org
 COMMENT=	Network device configuration backup tool
 WWW=		https://github.com/ytti/oxidized
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	rubygem-asetus>=0.4<1:devel/rubygem-asetus \
 		rubygem-bcrypt_pbkdf>=1.0<2:security/rubygem-bcrypt_pbkdf \
 		rubygem-ed25519>=1.2<2:security/rubygem-ed25519 \
 		rubygem-net-ftp>=0.2:ftp/rubygem-net-ftp \
 		rubygem-net-http-digest_auth>=1.4<2:www/rubygem-net-http-digest_auth \
 		rubygem-net-ssh>=7.3,2<8,2:security/rubygem-net-ssh \
 		rubygem-net-telnet>=0.2<1:security/rubygem-net-telnet \
 		rubygem-psych>=5.0<6:textproc/rubygem-psych \
 		rubygem-rugged>=1.6<2:devel/rubygem-rugged \
 		rubygem-semantic_logger>=4.17.0:devel/rubygem-semantic_logger \
 		rubygem-slop>=4.6<5:devel/rubygem-slop \
 		rubygem-syslog>=0.3.0:devel/rubygem-syslog \
 		rubygem-syslog_protocol>=0.9.2:devel/rubygem-syslog_protocol
 
 USES=		gem shebangfix
 USE_RC_SUBR=	oxidized
 
 SHEBANG_FILES=	extra/*.runit
 
 NO_ARCH=	yes
-SUB_LIST=	RUBY=${RUBY}
 
 USERS=		oxidized
 GROUPS=		oxidized
 
 PLIST_FILES=	bin/oxidized
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/rubygem-oxidized/files/oxidized.in b/net-mgmt/rubygem-oxidized/files/oxidized.in
index 67efb39068dd..ccf0774d34ee 100644
--- a/net-mgmt/rubygem-oxidized/files/oxidized.in
+++ b/net-mgmt/rubygem-oxidized/files/oxidized.in
@@ -1,59 +1,59 @@
 #!/bin/sh
 
 # PROVIDE: oxidized
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Configuration settings for oxidized in /etc/rc.conf:
 #
 # oxidized_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable oxidized
 #
 # oxidized_args (str):
 #   Extra arguments passed to start command
 #
 # oxidized_home (str)
 #   Set to "/var/db/oxidized" by default.
 #   Set the OXIDIZED_HOME variable for oxidized process
 #
 # oxidized_user (str):
 #   Set to "oxidized" by default.
 #   User to run oxidized as.
 #
 # oxidized_group (str):
 #   Set to "oxidized" by default.
 #   Group for data file ownership.
 #
 
 . /etc/rc.subr
 
 name="oxidized"
 rcvar=oxidized_enable
 
 load_rc_config "${name}"
 
 : ${oxidized_enable="NO"}
 : ${oxidized_home="/var/db/oxidized"}
 : ${oxidized_args=""}
 : ${oxidized_user="oxidized"}
 : ${oxidized_group="oxidized"}
 
 piddir="/var/run/${name}"
 pidfile="${piddir}/${name}.pid"
-procname=%%RUBY%%
+procname=/usr/sbin/daemon
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} %%PREFIX%%/bin/oxidized ${oxidized_args}"
+command_args="-f -P ${pidfile} %%PREFIX%%/bin/oxidized ${oxidized_args}"
 
 export HOME=${oxidized_home}
 
 start_precmd="oxidized_prestart"
 
 oxidized_prestart() {
 	if [ ! -d ${piddir} ]; then
 		install -d -o "${oxidized_user}" -g "${oxidized_group}" -m 750 ${piddir}
 	fi
 }
 
 run_rc_command "$1"