diff -ruN py-musicbrainz2.orig/Makefile py-musicbrainz2/Makefile
--- py-musicbrainz2.orig/Makefile	2008-03-26 20:29:30.000000000 -0400
+++ py-musicbrainz2/Makefile	2008-03-26 22:08:52.000000000 -0400
@@ -5,10 +5,12 @@
 # $FreeBSD: ports/audio/py-musicbrainz2/Makefile,v 1.4 2007/07/30 09:40:59 alexbl Exp $
 
 PORTNAME=	musicbrainz2
-PORTVERSION=	0.3.1
+PORTVERSION=	0.6.0
 CATEGORIES=	audio python
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/ \
-		http://zim.musicbrainz.org/~matt/
+		http://uk.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/ \
+		http://users.musicbrainz.org/~matt/ \
+		http://ftp.osuosl.org/pub/musicbrainz/python-musicbrainz2/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-musicbrainz2-${DISTVERSION}
 
@@ -17,10 +19,16 @@
 
 BUILD_DEPENDS=	${PYCTYPES}
 RUN_DEPENDS=	${PYCTYPES}
-LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+LIB_DEPENDS=	discid.2:${PORTSDIR}/audio/libdiscid
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	python-musicbrainz2
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-extract:
+	@${REINPLACE_CMD} -e 's|libdiscid.so.0|libdiscid.so.2|g' \
+		${WRKSRC}/src/musicbrainz2/disc.py
+
+.include <bsd.port.post.mk>
diff -ruN py-musicbrainz2.orig/distinfo py-musicbrainz2/distinfo
--- py-musicbrainz2.orig/distinfo	2008-03-26 20:29:30.000000000 -0400
+++ py-musicbrainz2/distinfo	2008-03-26 20:36:18.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (python-musicbrainz2-0.3.1.tar.gz) = 2ff59193f357c84e9e7b2f89356c0939
-SHA256 (python-musicbrainz2-0.3.1.tar.gz) = 02942c7fc753dbf47ad120a53fc188c6b59729dd69485fcf1cdc85b78957817e
-SIZE (python-musicbrainz2-0.3.1.tar.gz) = 54354
+MD5 (python-musicbrainz2-0.6.0.tar.gz) = 2ab23c3c15885d29ebd01bcc44ccc823
+SHA256 (python-musicbrainz2-0.6.0.tar.gz) = 2d0f590d33b61065d9cef66797bd95720d735e11afd7309100b44652a77788b2
+SIZE (python-musicbrainz2-0.6.0.tar.gz) = 67057
diff -ruN py-musicbrainz2.orig/pkg-plist py-musicbrainz2/pkg-plist
--- py-musicbrainz2.orig/pkg-plist	2008-03-26 20:29:30.000000000 -0400
+++ py-musicbrainz2/pkg-plist	2008-03-26 22:16:35.000000000 -0400
@@ -1,24 +1,36 @@
+bin/mb-submit-disc
 %%PYTHON_SITELIBDIR%%/musicbrainz2/__init__.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/disc.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/model.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/utils.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/country_names.csv
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/language_names.csv
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/release_type_names.csv
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/script_names.csv
 %%PYTHON_SITELIBDIR%%/musicbrainz2/__init__.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/disc.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/model.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/utils.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.pyc
 %%PYTHON_SITELIBDIR%%/musicbrainz2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/__init__.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/__init__.pyc
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/__init__.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/countrynames.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/countrynames.pyc
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/countrynames.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/languagenames.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/languagenames.pyc
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/languagenames.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/releasetypenames.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/releasetypenames.pyc
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/releasetypenames.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/scriptnames.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/scriptnames.pyc
+%%PYTHON_SITELIBDIR%%/musicbrainz2/data/scriptnames.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/disc.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/disc.pyc
 %%PYTHON_SITELIBDIR%%/musicbrainz2/disc.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/model.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/model.pyc
 %%PYTHON_SITELIBDIR%%/musicbrainz2/model.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/utils.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/utils.pyc
 %%PYTHON_SITELIBDIR%%/musicbrainz2/utils.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.pyc
 %%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.pyo
+%%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.py
+%%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.pyc
 %%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/musicbrainz2/data
 @dirrm %%PYTHON_SITELIBDIR%%/musicbrainz2