diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 3725e031eca0..41eedffab60e 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	karaoke
 PORTVERSION=	0.7.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -24,12 +24,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
 USES=		desktop-file-utils iconv zip
 USE_SDL=	sdl
 USE_XORG=	x11 xau xcb xdmcp
-USE_WX=		2.6+
+USE_WX=		3.0+
 WX_COMPS=	python:lib
 
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	py${PORTNAME}
+PYDISTUTILS_AUTOPLIST=	yes
 
 DATADIR=	${PREFIX}/share/py${PORTNAME}
 
diff --git a/audio/py-karaoke/pkg-plist b/audio/py-karaoke/pkg-plist
index a03553522805..0d321bde441b 100644
--- a/audio/py-karaoke/pkg-plist
+++ b/audio/py-karaoke/pkg-plist
@@ -1,61 +1,5 @@
-bin/cdg2mpg
-bin/pycdg
-bin/pykar
-bin/pykaraoke
-bin/pykaraoke_mini
-bin/pympg
-%%PYTHON_SITELIBDIR%%/_pycdgAux.so
-%%PYTHON_SITELIBDIR%%/performer_prompt.py
-%%PYTHON_SITELIBDIR%%/performer_prompt.pyc
-%%PYTHON_SITELIBDIR%%/performer_prompt.pyo
-%%PYTHON_SITELIBDIR%%/pycdg.py
-%%PYTHON_SITELIBDIR%%/pycdg.pyc
-%%PYTHON_SITELIBDIR%%/pycdg.pyo
-%%PYTHON_SITELIBDIR%%/pycdgAux.py
-%%PYTHON_SITELIBDIR%%/pycdgAux.pyc
-%%PYTHON_SITELIBDIR%%/pycdgAux.pyo
-%%PYTHON_SITELIBDIR%%/pykar.py
-%%PYTHON_SITELIBDIR%%/pykar.pyc
-%%PYTHON_SITELIBDIR%%/pykar.pyo
-%%PYTHON_SITELIBDIR%%/pykaraoke.py
-%%PYTHON_SITELIBDIR%%/pykaraoke.pyc
-%%PYTHON_SITELIBDIR%%/pykaraoke.pyo
-%%PYTHON_SITELIBDIR%%/pykaraoke_mini.py
-%%PYTHON_SITELIBDIR%%/pykaraoke_mini.pyc
-%%PYTHON_SITELIBDIR%%/pykaraoke_mini.pyo
-%%PYTHON_SITELIBDIR%%/pykconstants.py
-%%PYTHON_SITELIBDIR%%/pykconstants.pyc
-%%PYTHON_SITELIBDIR%%/pykconstants.pyo
-%%PYTHON_SITELIBDIR%%/pykdb.py
-%%PYTHON_SITELIBDIR%%/pykdb.pyc
-%%PYTHON_SITELIBDIR%%/pykdb.pyo
-%%PYTHON_SITELIBDIR%%/pykenv.py
-%%PYTHON_SITELIBDIR%%/pykenv.pyc
-%%PYTHON_SITELIBDIR%%/pykenv.pyo
-%%PYTHON_SITELIBDIR%%/pykmanager.py
-%%PYTHON_SITELIBDIR%%/pykmanager.pyc
-%%PYTHON_SITELIBDIR%%/pykmanager.pyo
-%%PYTHON_SITELIBDIR%%/pykplayer.py
-%%PYTHON_SITELIBDIR%%/pykplayer.pyc
-%%PYTHON_SITELIBDIR%%/pykplayer.pyo
-%%PYTHON_SITELIBDIR%%/pykversion.py
-%%PYTHON_SITELIBDIR%%/pykversion.pyc
-%%PYTHON_SITELIBDIR%%/pykversion.pyo
-%%PYTHON_SITELIBDIR%%/pympg.py
-%%PYTHON_SITELIBDIR%%/pympg.pyc
-%%PYTHON_SITELIBDIR%%/pympg.pyo
-share/applications/pykaraoke.desktop
-share/applications/pykaraoke_mini.desktop
 %%DATADIR%%/fonts/DejaVuSans.ttf
 %%DATADIR%%/fonts/DejaVuSansCondensed-Bold.ttf
 %%DATADIR%%/fonts/DejaVuSansCondensed.ttf
-%%DATADIR%%/icons/audio_16.png
-%%DATADIR%%/icons/folder_close_16.png
-%%DATADIR%%/icons/folder_open_16.png
-%%DATADIR%%/icons/microphone.ico
-%%DATADIR%%/icons/microphone.png
-%%DATADIR%%/icons/pykaraoke.xpm
-%%DATADIR%%/icons/splash.png
-@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%