diff --git a/audio/py-musicbrainzngs/Makefile b/audio/py-musicbrainzngs/Makefile
index 8fab94f6670f..49e43f405d35 100644
--- a/audio/py-musicbrainzngs/Makefile
+++ b/audio/py-musicbrainzngs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	musicbrainzngs
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Python Musicbrainz NGS site bindings
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE ISCL
+LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_PYTHON=	yes
diff --git a/audio/py-musicbrainzngs/distinfo b/audio/py-musicbrainzngs/distinfo
index e4ee06c6fa4f..61851f41c4c9 100644
--- a/audio/py-musicbrainzngs/distinfo
+++ b/audio/py-musicbrainzngs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (musicbrainzngs-0.4.tar.gz) = 1a1b7c3cce851c491d5ad71b501bbed2bd653098e33565a0534050d4b922265a
-SIZE (musicbrainzngs-0.4.tar.gz) = 52858
+SHA256 (musicbrainzngs-0.5.tar.gz) = 281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489
+SIZE (musicbrainzngs-0.5.tar.gz) = 61632
diff --git a/audio/py-musicbrainzngs/files/patch-setup.py b/audio/py-musicbrainzngs/files/patch-setup.py
deleted file mode 100644
index 577cc04bfe0c..000000000000
--- a/audio/py-musicbrainzngs/files/patch-setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- setup.py.orig	2013-06-06 19:19:28.876582953 -0500
-+++ setup.py	2013-06-06 19:19:45.698579171 -0500
-@@ -52,15 +52,6 @@
-     author_email="alastair@porter.net.nz",
-     url="https://github.com/alastair/python-musicbrainz-ngs",
-     packages=['musicbrainzngs'],
--    package_data={'musicbrainzngs': ['CHANGES',
--                                     '../docs/*',
--                                     '../examples/*',
--                                     '../test/data/*.xml',
--                                     '../test/data/artist/*',
--                                     '../test/data/label/*',
--                                     '../test/data/release/*',
--                                     '../test/data/release-group/*',
--                                     '../test/data/work/*']},
-     cmdclass={'test': test },
-     license='BSD 2-clause',
-     classifiers=[