diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index e113bf1d4716..312aad9d8ae9 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pytone
-PORTVERSION=	3.0.2
-PORTREVISION=	2
+PORTVERSION=	3.0.3
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.luga.de/pytone/download/ \
 		http://redundancy.redundancy.org/mirror/
@@ -12,37 +11,45 @@ DISTNAME=	PyTone-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music jukebox written in Python with a curses GUI
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+		${PYTHON_PKGNAMEPREFIX}mutagen>0y:${PORTSDIR}/audio/py-mutagen
+		
 
 USES=		ncurses
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
-OPTIONS_DEFINE=	MAD VORBIS PYAO MPG123 MPG321
-OPTIONS_DEFAULT=	MAD VORBIS
-PYAO_DESC=	${AO_DESC}
-MPG123_DESC=	mpg123 player engine
-MPG321_DESC=	mpg321 player engine
-PLIST_FILES=	etc/pytonerc.sample
-
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-MAD_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
-VORBIS_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
-PYAO_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao
-MPG123_RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123
-MPG321_RUN_DEPENDS+=	${LOCALBASE}/bin/mpg321:${PORTSDIR}/audio/mpg321
+SUB_FILES=	pkg-message
+
+PLIST_FILES=	etc/pytonerc.sample
+
+OPTIONS_DEFINE=		MAD MPG123 MPG321 PYAO VORBIS
+OPTIONS_DEFAULT=	MAD VORBIS
+
+MAD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mad>0:${PORTSDIR}/audio/py-mad
+MPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MPG321_DESC=		MP3 decoding support via mpg321
+MPG321_RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
+PYAO_DESC=		${AO_DESC}
+PYAO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ao>0:${PORTSDIR}/audio/py-ao
+VORBIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|src/|${PYTHON_SITELIBDIR}/pytone/|g' \
-		${WRKSRC}/pytone
-	@${REINPLACE_CMD} -e 's|src/|${PYTHON_SITELIBDIR}/pytone/|g' \
-		${WRKSRC}/pytonectl
+.for i in pytone pytonectl
+	@${REINPLACE_CMD} -e \
+		's|^python |${PYTHON_CMD} | ; \
+		 s|src/|${PYTHONPREFIX_SITELIBDIR}/pytone/|' ${WRKSRC}/${i}
+.endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/conf/pytonerc ${STAGEDIR}${PREFIX}/etc/pytonerc.sample
+	(cd ${WRKSRC}/conf && ${INSTALL_DATA} pytonerc \
+		${STAGEDIR}${PREFIX}/etc/pytonerc.sample)
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pytone/*.so
 
 .include <bsd.port.mk>
diff --git a/audio/pytone/distinfo b/audio/pytone/distinfo
index c3f6a9151114..8616e931ab00 100644
--- a/audio/pytone/distinfo
+++ b/audio/pytone/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyTone-3.0.2.tar.gz) = 303fdf52733deb27f00f8449e339972c6568b0180f58450685f101fdc1c24832
-SIZE (PyTone-3.0.2.tar.gz) = 161636
+SHA256 (PyTone-3.0.3.tar.gz) = 50b31aadb2b810549ab1441cd1e8de023a9c9a28a914a676a68c8a781000ab1e
+SIZE (PyTone-3.0.3.tar.gz) = 161612
diff --git a/audio/pytone/pkg-message b/audio/pytone/files/pkg-message.in
similarity index 80%
rename from audio/pytone/pkg-message
rename to audio/pytone/files/pkg-message.in
index 43fcbd35af0b..1ea9f799e5b7 100644
--- a/audio/pytone/pkg-message
+++ b/audio/pytone/files/pkg-message.in
@@ -1,7 +1,7 @@
 
 ###############################################################
 
-To use pytone, you should copy ${LOCALBASE}/etc/pytonerc.sample to:
+To use pytone, you should copy %%PREFIX%%/etc/pytonerc.sample to:
 
 ~/.pytone/pytonerc