diff --git a/audio/hpsjam/Makefile b/audio/hpsjam/Makefile
index e73f33c4d587..604108589ff8 100644
--- a/audio/hpsjam/Makefile
+++ b/audio/hpsjam/Makefile
@@ -1,28 +1,33 @@
 PORTNAME=	hpsjam
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.2.6
+PORTREVISION=		1
 CATEGORIES=	audio
 
 MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	Online jamming client and server tool
 WWW=		https://github.com/hselasky/hpsjam
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS= \
 	libjack.so:audio/jack
 
 USES=		compiler:c++11-lang gl qmake qt:5 tar:bzip2
 USE_GL=		gl
 USE_QT=		buildtools:build core gui widgets svg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hselasky
 GH_TUPLE=	mborgerding:kissfft:131.1.0:a/kissfft
 
+USER=           nobody
+SUB_LIST=       USER=${USER}
+USE_RC_SUBR=    ${PORTNAME}_server
+
 PLIST_FILES= \
 	bin/HpsJam \
 	share/pixmaps/HpsJam.png \
 	share/applications/HpsJam.desktop
 
 .include <bsd.port.mk>
diff --git a/audio/hpsjam/files/hpsjam_server.in b/audio/hpsjam/files/hpsjam_server.in
new file mode 100644
index 000000000000..e96f569ad279
--- /dev/null
+++ b/audio/hpsjam/files/hpsjam_server.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# PROVIDE: hpsjam_server
+# REQUIRE: DAEMON NETWORKING
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable hpsjam_server:
+# hpsjam_server_enable   : set to "YES" to enable the daemon, default is "NO"
+# hpsjam_server_uname    : user to run hpsjam_server as, default is "%%USER%%"
+# hpsjam_server_flags    : extra flags to pass to daemon(8), default is ""
+# hpsjam_server_args     : any arguments to pass to hpsjam_server, default is ""
+#
+# See output from HpsJam --help for more options
+#
+
+. /etc/rc.subr
+
+name=hpsjam_server
+rcvar=hpsjam_server_enable
+
+load_rc_config $name
+
+hpsjam_server_enable=${hpsjam_server_enable:-"NO"}
+hpsjam_server_uname=${hpsjam_server_uname:-"%%USER%%"}
+hpsjam_server_flags=${hpsjam_server_flags:-""}
+hpsjam_server_args=${hpsjam_server_args:-""}
+
+logfile="/var/log/${name}.log"
+
+procname=%%PREFIX%%/bin/HpsJam
+command="/usr/sbin/daemon"
+command_args="-u ${hpsjam_server_uname} -o ${logfile} -t ${name} ${procname} --server ${hpsjam_server_args}"
+
+run_rc_command "$1"