diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index 2d931d032318..237ecfe64850 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -9,25 +9,22 @@ MASTER_SITES=	http://mpdbrowser.tuxfamily.org/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	mpdBrowser-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org	
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ client for the Music Player Daemon (MPD)
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
 
-PYDISTUTILS_PKGNAME=	mpdBrowser
-USES=		gettext iconv tar:tgz
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		gettext iconv python:2 tar:tgz
 USE_GNOME=	intltool pygtk2
+USE_PYTHON=	distutils
+PYDISTUTILS_PKGNAME=	mpdBrowser
 
 OPTIONS_DEFINE=		MPD
 OPTIONS_DEFAULT=	MPD
-MPD_DESC=	Install Music Player Daemon
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMPD}
-RUN_DEPENDS+=	musicpd:${PORTSDIR}/audio/musicpd
-.endif
+MPD_DESC=		Install Music Player Daemon
+MPD_RUN_DEPENDS=	musicpd:${PORTSDIR}/audio/musicpd
 
 .include <bsd.port.mk>
diff --git a/audio/mpdbrowser/pkg-plist b/audio/mpdbrowser/pkg-plist
index 5ebb6f013820..1758731e3196 100644
--- a/audio/mpdbrowser/pkg-plist
+++ b/audio/mpdbrowser/pkg-plist
@@ -50,6 +50,3 @@ share/mpdBrowser/TRANSLATORS
 share/pixmaps/mpdBrowser.png
 share/pixmaps/mpdBrowser_case.png
 share/pixmaps/mpdBrowser_empty.png
-@dirrmtry %%PYTHON_SITELIBDIR%%/mpdBrowser
-@dirrmtry %%PYTHON_SITELIBDIR%%/mpdBrowser-0.9.16-py2.7.egg-info
-@dirrmtry share/mpdBrowser