diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile
index 514bb56dbf91..0e089b9cb883 100644
--- a/audio/py-musicbrainz/Makefile
+++ b/audio/py-musicbrainz/Makefile
@@ -1,50 +1,50 @@
 # New ports collection makefile for:	py-musicbrainz
 # Date created:		23 March 2003
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	musicbrainz
-PORTVERSION=	1.0.b1
+PORTVERSION=	1.0.b3
 PORTEPOCH=	1
 CATEGORIES=	audio python
-MASTER_SITES=	http://icepick.info/projects/python-musicbrainz/
+MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
+DISTNAME=	python-${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}-picard
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	MusicBrainz bindings for Python
 
 BUILD_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/ctypes/__init__.py:${PORTSDIR}/devel/py-ctypes
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	musicbrainz.4:${LIBMUSICBRAINZ_PORTDIR}
 
 LIBMUSICBRAINZ_PORTDIR=	${PORTSDIR}/audio/libmusicbrainz
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 EXAMPLES=	cd2trm.py findartist.py getcdtracklengths.py cdid.py \
 		findtrack.py gettrm.py cdlookup.py generatetrm.py \
 		fileinfolookup.py getalbum.py
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_BUILDARGS=	build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/musicbrainz.py \
 		%%PYTHON_SITELIBDIR%%/musicbrainz.pyc \
 		%%PYTHON_SITELIBDIR%%/musicbrainz.pyo
 
 .ifndef(NOPORTDOCS)
 PLIST_FILES+=	${EXAMPLES:S/^/%%EXAMPLESDIR%%\//}
 PLIST_DIRS=	%%EXAMPLESDIR%%
 .endif
 
 post-install:
 .ifndef(NOPORTDOCS)
 		${MKDIR} ${EXAMPLESDIR}
 .for i in ${EXAMPLES}
 		${INSTALL_SCRIPT} ${WRKSRC}/examples/${i} ${EXAMPLESDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/py-musicbrainz/distinfo b/audio/py-musicbrainz/distinfo
index e79b09d40af6..0dc32a99b05d 100644
--- a/audio/py-musicbrainz/distinfo
+++ b/audio/py-musicbrainz/distinfo
@@ -1,2 +1,2 @@
-MD5 (python-musicbrainz-1.0b1.tar.gz) = 8f07d75e67f3b2f1de89327126c0f418
-SIZE (python-musicbrainz-1.0b1.tar.gz) = 21029
+MD5 (python-musicbrainz-1.0b3-picard.tar.gz) = 0f37fc72695e0909ad9cb183b3660d75
+SIZE (python-musicbrainz-1.0b3-picard.tar.gz) = 21468
diff --git a/audio/py-musicbrainz/files/patch-musicbrainz.py b/audio/py-musicbrainz/files/patch-musicbrainz.py
new file mode 100644
index 000000000000..98951b00b973
--- /dev/null
+++ b/audio/py-musicbrainz/files/patch-musicbrainz.py
@@ -0,0 +1,17 @@
+--- musicbrainz.py.orig	Tue Aug 17 03:44:32 2004
++++ musicbrainz.py	Sat Aug 20 13:57:38 2005
+@@ -35,7 +35,13 @@
+         if sys.platform == "linux2":
+            lib = "libmusicbrainz.so.4"
+         else:
+-           raise MusicBrainzError, "Unknown platform: " + sys.platform 
++            if sys.platform == "freebsd5":
++               lib = "libmusicbrainz.so.4"
++            else:
++                if sys.platform == "freebsd6":
++                   lib = "libmusicbrainz.so.4"
++                else:
++                    raise MusicBrainzError, "Unknown platform: " + sys.platform 
+   
+     path = "/usr/lib/" + lib
+     if os.access(path, os.F_OK):