diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 04c341eb70f..3da2a2d5622 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2011/09/16 08:26:10 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2012/05/04 06:24:04 ajacoutot Exp $
 
 COMMENT =		automatic audio files tagger using the MusicBrainz database
 
-MODPY_EGG_VERSION =	0.12.1
+MODPY_EGG_VERSION =	0.16
 DISTNAME =		picard-${MODPY_EGG_VERSION}
-REVISION =		2
 
 CATEGORIES =		audio
 
@@ -32,7 +31,8 @@ MODPY_DISTUTILS_INSTALL=install --prefix=${LOCALBASE} --root=${DESTDIR}
 # msgfmt
 BUILD_DEPENDS =		devel/gettext
 
-LIB_DEPENDS =		audio/libofa graphics/ffmpeg
+LIB_DEPENDS =		audio/libofa \
+			graphics/ffmpeg
 
 RUN_DEPENDS =		x11/py-qt4>=4.1 \
 			audio/py-mutagen>=1.9 \
@@ -41,21 +41,31 @@ RUN_DEPENDS =		x11/py-qt4>=4.1 \
 REGRESS_DEPENDS =	${BASE_PKGPATH}
 
 PLUGINS_DIRS =		lastfm \
+			lastfmplus \
 			replaygain
-PLUGINS =		addrelease.py \
+PLUGINS =		classicdiscnumber.py \
 			coverart.py \
 			cuesheet.py \
 			discnumber.py \
 			featartist.py \
-			fix_mp4_meta.py \
+			featartistsintitles.py \
 			lastfm/__init__.py \
 			lastfm/options_lastfm.ui \
 			lastfm/ui_options_lastfm.py \
-			originalreleasedate.py \
+			lastfmplus/__init__.py \
+			lastfmplus/ui_options_lastfm.py \
+			no_release.py \
+			open_in_gui.py \
+			release_type.py \
 			replaygain/__init__.py \
 			replaygain/options_replaygain.ui \
 			replaygain/ui_options_replaygain.py \
-			titlecase.py
+			swapprefix.py \
+			titlecase.py \
+			tracks2clipboard.py
+
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/setup.py
 
 post-install:
 .for dir in ${PLUGINS_DIRS}
diff --git a/audio/picard/distinfo b/audio/picard/distinfo
index fd3f9142f5b..75e1c642e8e 100644
--- a/audio/picard/distinfo
+++ b/audio/picard/distinfo
@@ -1,5 +1,5 @@
-MD5 (picard-0.12.1.tar.gz) = z+WU1okkr7wHBIiBMClchQ==
-RMD160 (picard-0.12.1.tar.gz) = nZHlP26g/UxKJb0dvYA2pBOXGu8=
-SHA1 (picard-0.12.1.tar.gz) = llQS3pVNKnNIehMytJrHcl5xnww=
-SHA256 (picard-0.12.1.tar.gz) = f/sopHthDEXP2XLqy7ZclaIkrq7QdQ1XxhpH0p+agYM=
-SIZE (picard-0.12.1.tar.gz) = 1361157
+MD5 (picard-0.16.tar.gz) = V5GlrhzpKsH/scyPFZF61w==
+RMD160 (picard-0.16.tar.gz) = N1YQz9j/A4JeIq9yZzD6hcfLVP0=
+SHA1 (picard-0.16.tar.gz) = J0BxQQVQ7ikFG7ATfXJgKSGgFfk=
+SHA256 (picard-0.16.tar.gz) = ViMhb+3fYAAYfOrTdGs66+X2A4N+MTx9/Jl4NXb1Sxg=
+SIZE (picard-0.16.tar.gz) = 1828595
diff --git a/audio/picard/patches/patch-setup_py b/audio/picard/patches/patch-setup_py
index a4796447d0a..a7cb0741465 100644
--- a/audio/picard/patches/patch-setup_py
+++ b/audio/picard/patches/patch-setup_py
@@ -1,6 +1,6 @@
-$OpenBSD: patch-setup_py,v 1.2 2010/11/20 15:48:58 millert Exp $
---- setup.py.orig	Sun Nov  1 13:10:27 2009
-+++ setup.py	Fri Nov 19 08:22:02 2010
+$OpenBSD: patch-setup_py,v 1.3 2012/05/04 06:24:04 ajacoutot Exp $
+--- setup.py.orig	Sun Oct 23 13:15:29 2011
++++ setup.py	Sat Apr 28 18:29:55 2012
 @@ -62,12 +62,12 @@ from distutils.dist import Distribution
  defaults = {
      'build': {
@@ -11,10 +11,10 @@ $OpenBSD: patch-setup_py,v 1.2 2010/11/20 15:48:58 millert Exp $
 +        'with-libofa': 'True',
      },
 -    'avcodec': {'cflags': '', 'libs': ''},
-+    'avcodec': {'cflags': '-I/usr/local/include', 'libs': '-L/usr/local/lib -lavcodec -lavformat'},
++    'avcodec': {'cflags': '-I${LOCALBASE}/include', 'libs': '-L${LOCALBASE}/lib -lavcodec -lavformat'},
      'directshow': {'cflags': '', 'libs': ''},
 -    'libofa': {'cflags': '', 'libs': ''},
-+    'libofa': {'cflags': '-I/usr/local/include', 'libs': '-L/usr/local/lib -lofa'},
++    'libofa': {'cflags': '-I${LOCALBASE}/include', 'libs': '-L${LOCALBASE}/lib -lofa'},
  }
  cfg = RawConfigParser()
  for section, values in defaults.items():
@@ -38,7 +38,7 @@ $OpenBSD: patch-setup_py,v 1.2 2010/11/20 15:48:58 millert Exp $
          else:
              self.check_lib('avcodec', 'av_open_input_file', ['avcodec.h', 'avformat.h'], [['avcodec', 'avformat'], ['avcodec-51', 'avformat-51']])
  
-@@ -549,12 +549,12 @@ if do_py2app:
+@@ -550,12 +550,12 @@ if do_py2app:
  
  # FIXME: this should check for the actual command ('install' vs. 'bdist_nsis', 'py2app', ...), not installed libraries
  if py2exe is None and do_py2app is False:
diff --git a/audio/picard/pkg/PLIST b/audio/picard/pkg/PLIST
index dfc35347285..920921ffad5 100644
--- a/audio/picard/pkg/PLIST
+++ b/audio/picard/pkg/PLIST
@@ -1,9 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/11/20 15:48:58 millert Exp $
+@comment $OpenBSD: PLIST,v 1.4 2012/05/04 06:24:04 ajacoutot Exp $
 bin/picard
 lib/python${MODPY_VERSION}/site-packages/picard/
 lib/python${MODPY_VERSION}/site-packages/picard-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/picard/__init__.py
 lib/python${MODPY_VERSION}/site-packages/picard/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/acoustid.py
+lib/python${MODPY_VERSION}/site-packages/picard/acoustid.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/acoustidmanager.py
+lib/python${MODPY_VERSION}/site-packages/picard/acoustidmanager.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/album.py
 lib/python${MODPY_VERSION}/site-packages/picard/album.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/artist.py
@@ -62,8 +66,6 @@ lib/python${MODPY_VERSION}/site-packages/picard/musicdns/avcodec.so
 lib/python${MODPY_VERSION}/site-packages/picard/musicdns/ofa.so
 lib/python${MODPY_VERSION}/site-packages/picard/parsefilename.py
 lib/python${MODPY_VERSION}/site-packages/picard/parsefilename.pyc
-lib/python${MODPY_VERSION}/site-packages/picard/playlist.py
-lib/python${MODPY_VERSION}/site-packages/picard/playlist.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/plugin.py
 lib/python${MODPY_VERSION}/site-packages/picard/plugin.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/plugins/
@@ -113,6 +115,8 @@ lib/python${MODPY_VERSION}/site-packages/picard/ui/options/cover.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/cover.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/dialog.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/dialog.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/fingerprinting.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/fingerprinting.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/folksonomy.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/folksonomy.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/general.py
@@ -131,6 +135,8 @@ lib/python${MODPY_VERSION}/site-packages/picard/ui/options/proxy.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/proxy.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/ratings.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/ratings.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/releases.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/releases.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/renaming.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/renaming.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/options/scripting.py
@@ -163,6 +169,8 @@ lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup_select.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup_select.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cover.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cover.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_fingerprinting.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_fingerprinting.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_folksonomy.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_folksonomy.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_general.py
@@ -181,6 +189,8 @@ lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_proxy.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_proxy.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_ratings.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_ratings.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_releases.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_releases.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_renaming.py
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_renaming.pyc
 lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_script.py
@@ -220,34 +230,43 @@ lib/python${MODPY_VERSION}/site-packages/picard/webservice.pyc
 share/applications/picard.desktop
 share/locale/af/LC_MESSAGES/picard.mo
 share/locale/ar/LC_MESSAGES/picard.mo
+share/locale/ast/LC_MESSAGES/picard.mo
 share/locale/bg/LC_MESSAGES/picard.mo
 share/locale/ca/LC_MESSAGES/picard.mo
 share/locale/cs/LC_MESSAGES/picard.mo
 share/locale/cy/LC_MESSAGES/picard.mo
 share/locale/da/LC_MESSAGES/picard.mo
 share/locale/de/LC_MESSAGES/picard.mo
+share/locale/el/LC_MESSAGES/picard.mo
 share/locale/en/LC_MESSAGES/picard.mo
 share/locale/en_CA/LC_MESSAGES/picard.mo
 share/locale/en_GB/LC_MESSAGES/picard.mo
+share/locale/eo/LC_MESSAGES/picard.mo
 share/locale/es/LC_MESSAGES/picard.mo
 share/locale/et/LC_MESSAGES/picard.mo
 share/locale/fa/LC_MESSAGES/picard.mo
 share/locale/fi/LC_MESSAGES/picard.mo
+share/locale/fo/LC_MESSAGES/picard.mo
 share/locale/fr/LC_MESSAGES/picard.mo
-share/locale/fy/
-share/locale/fy/LC_MESSAGES/
+share/locale/fr_CA/
+share/locale/fr_CA/LC_MESSAGES/
+share/locale/fr_CA/LC_MESSAGES/picard.mo
 share/locale/fy/LC_MESSAGES/picard.mo
 share/locale/gl/LC_MESSAGES/picard.mo
 share/locale/he/LC_MESSAGES/picard.mo
 share/locale/hi/LC_MESSAGES/picard.mo
 share/locale/hu/LC_MESSAGES/picard.mo
+share/locale/id/LC_MESSAGES/picard.mo
 share/locale/is/LC_MESSAGES/picard.mo
 share/locale/it/LC_MESSAGES/picard.mo
+share/locale/ja/LC_MESSAGES/picard.mo
 share/locale/kn/LC_MESSAGES/picard.mo
 share/locale/ko/LC_MESSAGES/picard.mo
 share/locale/lt/LC_MESSAGES/picard.mo
 share/locale/nb/LC_MESSAGES/picard.mo
+share/locale/nds/LC_MESSAGES/picard.mo
 share/locale/nl/LC_MESSAGES/picard.mo
+share/locale/oc/LC_MESSAGES/picard.mo
 share/locale/pl/LC_MESSAGES/picard.mo
 share/locale/pt/LC_MESSAGES/picard.mo
 share/locale/pt_BR/LC_MESSAGES/picard.mo
@@ -260,25 +279,34 @@ share/locale/sk/LC_MESSAGES/picard.mo
 share/locale/sl/LC_MESSAGES/picard.mo
 share/locale/sr/LC_MESSAGES/picard.mo
 share/locale/sv/LC_MESSAGES/picard.mo
+share/locale/ta/LC_MESSAGES/picard.mo
 share/locale/tr/LC_MESSAGES/picard.mo
+share/locale/uk/LC_MESSAGES/picard.mo
 share/locale/zh_CN/LC_MESSAGES/picard.mo
 share/picard/
-share/picard/addrelease.py
+share/picard/classicdiscnumber.py
 share/picard/coverart.py
 share/picard/cuesheet.py
 share/picard/discnumber.py
 share/picard/featartist.py
-share/picard/fix_mp4_meta.py
+share/picard/featartistsintitles.py
 share/picard/lastfm/
 share/picard/lastfm/__init__.py
 share/picard/lastfm/options_lastfm.ui
 share/picard/lastfm/ui_options_lastfm.py
-share/picard/originalreleasedate.py
+share/picard/lastfmplus/
+share/picard/lastfmplus/__init__.py
+share/picard/lastfmplus/ui_options_lastfm.py
+share/picard/no_release.py
+share/picard/open_in_gui.py
+share/picard/release_type.py
 share/picard/replaygain/
 share/picard/replaygain/__init__.py
 share/picard/replaygain/options_replaygain.ui
 share/picard/replaygain/ui_options_replaygain.py
+share/picard/swapprefix.py
 share/picard/titlecase.py
+share/picard/tracks2clipboard.py
 share/pixmaps/
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database