Index: head/audio/forked-daapd/Makefile
===================================================================
--- head/audio/forked-daapd/Makefile
+++ head/audio/forked-daapd/Makefile
@@ -33,8 +33,6 @@
 CONFIGURE_ARGS+=--localstatedir=/var
 
 USE_RC_SUBR=	${PORTNAME}
-RC_NAME=	forked_daapd
-SUB_LIST=	PORTNAME=${PORTNAME} RC_NAME=${RC_NAME}
 SUB_FILES=	pkg-message
 
 USERS=		daapd
Index: head/audio/forked-daapd/files/forked-daapd.in
===================================================================
--- head/audio/forked-daapd/files/forked-daapd.in
+++ head/audio/forked-daapd/files/forked-daapd.in
@@ -2,34 +2,34 @@
 
 # $FreeBSD$
 #
-# PROVIDE: %%PORTNAME%%
+# PROVIDE: forked-daapd
 # REQUIRE: avahi_daemon dbus
 # KEYWORD: shutdown
 #
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
-# %%RC_NAME%%_enable (bool):	Set to NO by default.
-#				Set it to YES to enable %%PORTNAME%%.
-# %%RC_NAME%%_config (path):	Set to %%PREFIX%%/etc/forked-daapd.conf
+# forked_daapd_enable (bool):	Set to NO by default.
+#				Set it to YES to enable forked-daapd.
+# forked_daapd_config (path):	Set to %%PREFIX%%/etc/forked-daapd.conf
 #				by default.
-# %%RC_NAME%%_flags (str):	Set to "" by default
+# forked_daapd_flags (str):	Set to "" by default
 
 . /etc/rc.subr
 
-name=%%RC_NAME%%
+name=forked_daapd
 rcvar=${name}_enable
 
 load_rc_config $name
 
-: ${%%RC_NAME%%_enable:="NO"}
-: ${%%RC_NAME%%_config:="%%PREFIX%%/etc/forked-daapd.conf"}
-: ${%%RC_NAME%%_flags:=""}
+: ${forked_daapd_enable:="NO"}
+: ${forked_daapd_config:="%%PREFIX%%/etc/forked-daapd.conf"}
+: ${forked_daapd_flags:=""}
 
-pidfile="/var/run/%%PORTNAME%%.pid"
-required_files="$%%RC_NAME%%_config"
+pidfile="/var/run/forked-daapd.pid"
+required_files="$forked_daapd_config"
 
-command="%%PREFIX%%/sbin/%%PORTNAME%%"
-command_args="-P $pidfile -c $%%RC_NAME%%_config $%%RC_NAME%%_flags"
+command="%%PREFIX%%/sbin/forked-daapd"
+command_args="-P $pidfile -c $forked_daapd_config $forked_daapd_flags"
 
 run_rc_command "$1"
Index: head/audio/forked-daapd/files/pkg-message.in
===================================================================
--- head/audio/forked-daapd/files/pkg-message.in
+++ head/audio/forked-daapd/files/pkg-message.in
@@ -1,21 +1,21 @@
-%%PORTNAME%% uses FFmpeg for transcoding audio playback.
+forked-daapd uses FFmpeg for transcoding audio playback.
 The default ports/pkg build of FFmpeg on FreeBSD has a number
 of options which could be SET/UNSET to provide support for
 additional audio codecs.
 
-If you find %%PORTNAME%% does not support the audio codecs you
+If you find forked-daapd does not support the audio codecs you
 require, it is recommended to recompile the multimedia/ffmpeg
 package from ports with the necessary options ENABLED (SET).
 
-You should review and edit the %%PORTNAME%% configuration
-file %%PREFIX%%/etc/%%PORTNAME%%.conf before first use.
+You should review and edit the forked-daapd configuration
+file %%PREFIX%%/etc/forked-daapd.conf before first use.
 
-To automatically start %%PORTNAME%% at boot time:
+To automatically start forked-daapd at boot time:
 # sysrc 'dbus_enable=YES'
 # sysrc 'avahi_daemon_enable=YES'
-# sysrc '%%RC_NAME%%_enable=YES'
+# sysrc 'forked_daapd_enable=YES'
 
-To then manually start %%PORTNAME%% without rebooting:
+To then manually start forked-daapd without rebooting:
 # service dbus start
 # service avahi-daemon start
-# service %%PORTNAME%% start
+# service forked-daapd start