diff --git a/audio/freeswitch-music/Makefile b/audio/freeswitch-music/Makefile
index 32050d1493f0..1b718b2e0876 100644
--- a/audio/freeswitch-music/Makefile
+++ b/audio/freeswitch-music/Makefile
@@ -16,12 +16,13 @@ DIST_SUBDIR=	freeswitch
 MAINTAINER=	r.neese@gmail.com
 COMMENT=	FreeSwitch Music - All Bitrates
 
-RUN_DEPENDS=	${LOCALBASE}/bin/freeswitch:${PORTSDIR}/net/freeswitch-core
-
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-SHAREOWN=	${PORTNAME}
+USERS=		${PORTNAME}
+GROUPS=		${USERS}
+SHAREOWN=	${USERS}
 SHAREGRP=	${SHAREOWN}
+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS=	8K           "Install 8000Hz Music" on \
 		16K          "Install 16000Hz Music" on \
diff --git a/audio/freeswitch-music/pkg-plist b/audio/freeswitch-music/pkg-plist
index 56402b090dcb..45f5f83cdad1 100644
--- a/audio/freeswitch-music/pkg-plist
+++ b/audio/freeswitch-music/pkg-plist
@@ -20,3 +20,5 @@
 %%WITH_32K%%@dirrm %%DATADIR%%/sounds/music/32000
 %%WITH_48K%%@dirrm %%DATADIR%%/sounds/music/48000
 @dirrm %%DATADIR%%/sounds/music
+@dirrmtry %%DATADIR%%/sounds
+@dirrmtry %%DATADIR%%