diff --git a/audio/mutagen-tools/Makefile b/audio/mutagen-tools/Makefile
index 4e2e0266e653..ec920aefa7ca 100644
--- a/audio/mutagen-tools/Makefile
+++ b/audio/mutagen-tools/Makefile
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile,v 1.9 2017/01/01 14:43:22 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/05/09 13:14:32 leot Exp $
 
-DISTNAME=	mutagen-1.27
-PKGNAME=	mutagen-tools-1.27
+DISTNAME=	mutagen-1.37
+PKGNAME=	${DISTNAME:S/-/-tools-/}
 CATEGORIES=	audio
-MASTER_SITES=	https://bitbucket.org/lazka/mutagen/downloads/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mutagen/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://bitbucket.org/lazka/mutagen
+HOMEPAGE=	https://github.com/quodlibet/mutagen
 COMMENT=	Audio metadata handling for Python
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+DEPENDS+=	${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+
+SUBST_CLASSES+=			pkgmandir
+SUBST_STAGE.pkgmandir=		pre-configure
+SUBST_FILES.pkgmandir=		setup.py
+SUBST_MESSAGE.pkgmandir=	Fixing man page installation.
+SUBST_SED.pkgmandir=		-e 's,share/man,${PKGMANDIR},'
 
 USE_LANGUAGES=	# none
 PY_NO_EGG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # string type problems
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mutagen-tools/distinfo b/audio/mutagen-tools/distinfo
index 9a0e4285eaf8..f552abfc7e13 100644
--- a/audio/mutagen-tools/distinfo
+++ b/audio/mutagen-tools/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:12:43 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/05/09 13:14:32 leot Exp $
 
-SHA1 (mutagen-1.27.tar.gz) = 4c9b874feb6f1e9dbf6f2c37341dad3a47135640
-RMD160 (mutagen-1.27.tar.gz) = b6d4c5c880b9eba4b0377e04421c840392c20eff
-SHA512 (mutagen-1.27.tar.gz) = ae15fb3f5d77025a60e25a2ed25e23f7d21160d4e63c49fe7d01508440ff1f6b673cf34d8f4facc834824825ad6f4d3ed9830133db5aba339ac1eae46f7f50d5
-Size (mutagen-1.27.tar.gz) = 875720 bytes
-SHA1 (patch-aa) = c1a76e5371b2fdcb3e81af58fd783048577f1f77
+SHA1 (mutagen-1.37.tar.gz) = 973e29c3b27f2b99ac5b18899ef07c2c8c9b035e
+RMD160 (mutagen-1.37.tar.gz) = 8a8bce64ed57d7637a590e163a7e27f329a6a297
+SHA512 (mutagen-1.37.tar.gz) = f1bdd3d56526be718642d6599e7353879dc7e16f3d8758ff0221224310f5952cdc097dd70202be4b93c3a661f83b4f0d3e7730464f077d89614883571b80b180
+Size (mutagen-1.37.tar.gz) = 912600 bytes
+SHA1 (patch-aa) = 2c8e4fea8d9afcfca4f86ae7704b1e84df53c817
diff --git a/audio/mutagen-tools/patches/patch-aa b/audio/mutagen-tools/patches/patch-aa
index 335fa48dab9b..3cb29a69e9fe 100644
--- a/audio/mutagen-tools/patches/patch-aa
+++ b/audio/mutagen-tools/patches/patch-aa
@@ -1,22 +1,32 @@
-$NetBSD: patch-aa,v 1.4 2015/01/06 19:53:14 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2017/05/09 13:14:32 leot Exp $
 
---- setup.py.orig	2014-11-26 13:18:57.000000000 +0000
+Do not install any Python packages. They are provided separatedly by the
+audio/py-mutagen package.
+
+--- setup.py.orig	2017-02-24 13:15:32.000000000 +0000
 +++ setup.py
-@@ -219,7 +219,7 @@ class coverage_cmd(Command):
- 
- 
- if os.name == "posix":
--    data_files = [('share/man/man1', glob.glob("man/*.1"))]
-+    data_files = [(os.getenv("PKGMANDIR") + '/man1', glob.glob("man/*.1"))]
- else:
-     data_files = []
- 
-@@ -255,7 +255,7 @@ if __name__ == "__main__":
+@@ -258,15 +258,15 @@ if __name__ == "__main__":
              'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
              'Topic :: Multimedia :: Sound/Audio',
            ],
--          packages=["mutagen", "mutagen.id3", "mutagen.mp4"],
-+#          packages=["mutagen", "mutagen.id3", "mutagen.mp4"],
+-          packages=[
+-            "mutagen",
+-            "mutagen.id3",
+-            "mutagen.mp4",
+-            "mutagen.asf",
+-            "mutagen.mp3",
+-            "mutagen._senf",
+-            "mutagen._tools",
+-          ],
++#         packages=[
++#           "mutagen",
++#           "mutagen.id3",
++#           "mutagen.mp4",
++#           "mutagen.asf",
++#           "mutagen.mp3",
++#           "mutagen._senf",
++#           "mutagen._tools",
++#         ],
            data_files=data_files,
            scripts=[os.path.join("tools", name) for name in [
              "mid3cp",
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index 2226263cb1c0..9aad87debf00 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2015/11/04 09:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/09 13:14:32 leot Exp $
 
-DISTNAME=	mutagen-1.31
+DISTNAME=	mutagen-1.37
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	audio
-MASTER_SITES=	https://bitbucket.org/lazka/mutagen/downloads/
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mutagen/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://bitbucket.org/lazka/mutagen
+HOMEPAGE=	https://github.com/quodlibet/mutagen
 COMMENT=	Audio metadata handling for Python
 LICENSE=	gnu-gpl-v2
 
diff --git a/audio/py-mutagen/PLIST b/audio/py-mutagen/PLIST
index 26e0f1e434d5..8b3b6bff933d 100644
--- a/audio/py-mutagen/PLIST
+++ b/audio/py-mutagen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/11/04 09:53:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/05/09 13:14:32 leot Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/mutagen/__init__.py
 ${PYSITELIB}/mutagen/__init__.pyc
@@ -12,15 +12,63 @@ ${PYSITELIB}/mutagen/_constants.pyo
 ${PYSITELIB}/mutagen/_file.py
 ${PYSITELIB}/mutagen/_file.pyc
 ${PYSITELIB}/mutagen/_file.pyo
-${PYSITELIB}/mutagen/_mp3util.py
-${PYSITELIB}/mutagen/_mp3util.pyc
-${PYSITELIB}/mutagen/_mp3util.pyo
+${PYSITELIB}/mutagen/_senf/__init__.py
+${PYSITELIB}/mutagen/_senf/__init__.pyc
+${PYSITELIB}/mutagen/_senf/__init__.pyo
+${PYSITELIB}/mutagen/_senf/_argv.py
+${PYSITELIB}/mutagen/_senf/_argv.pyc
+${PYSITELIB}/mutagen/_senf/_argv.pyo
+${PYSITELIB}/mutagen/_senf/_compat.py
+${PYSITELIB}/mutagen/_senf/_compat.pyc
+${PYSITELIB}/mutagen/_senf/_compat.pyo
+${PYSITELIB}/mutagen/_senf/_environ.py
+${PYSITELIB}/mutagen/_senf/_environ.pyc
+${PYSITELIB}/mutagen/_senf/_environ.pyo
+${PYSITELIB}/mutagen/_senf/_fsnative.py
+${PYSITELIB}/mutagen/_senf/_fsnative.pyc
+${PYSITELIB}/mutagen/_senf/_fsnative.pyo
+${PYSITELIB}/mutagen/_senf/_print.py
+${PYSITELIB}/mutagen/_senf/_print.pyc
+${PYSITELIB}/mutagen/_senf/_print.pyo
+${PYSITELIB}/mutagen/_senf/_stdlib.py
+${PYSITELIB}/mutagen/_senf/_stdlib.pyc
+${PYSITELIB}/mutagen/_senf/_stdlib.pyo
+${PYSITELIB}/mutagen/_senf/_temp.py
+${PYSITELIB}/mutagen/_senf/_temp.pyc
+${PYSITELIB}/mutagen/_senf/_temp.pyo
+${PYSITELIB}/mutagen/_senf/_winansi.py
+${PYSITELIB}/mutagen/_senf/_winansi.pyc
+${PYSITELIB}/mutagen/_senf/_winansi.pyo
+${PYSITELIB}/mutagen/_senf/_winapi.py
+${PYSITELIB}/mutagen/_senf/_winapi.pyc
+${PYSITELIB}/mutagen/_senf/_winapi.pyo
 ${PYSITELIB}/mutagen/_tags.py
 ${PYSITELIB}/mutagen/_tags.pyc
 ${PYSITELIB}/mutagen/_tags.pyo
-${PYSITELIB}/mutagen/_toolsutil.py
-${PYSITELIB}/mutagen/_toolsutil.pyc
-${PYSITELIB}/mutagen/_toolsutil.pyo
+${PYSITELIB}/mutagen/_tools/__init__.py
+${PYSITELIB}/mutagen/_tools/__init__.pyc
+${PYSITELIB}/mutagen/_tools/__init__.pyo
+${PYSITELIB}/mutagen/_tools/_util.py
+${PYSITELIB}/mutagen/_tools/_util.pyc
+${PYSITELIB}/mutagen/_tools/_util.pyo
+${PYSITELIB}/mutagen/_tools/mid3cp.py
+${PYSITELIB}/mutagen/_tools/mid3cp.pyc
+${PYSITELIB}/mutagen/_tools/mid3cp.pyo
+${PYSITELIB}/mutagen/_tools/mid3iconv.py
+${PYSITELIB}/mutagen/_tools/mid3iconv.pyc
+${PYSITELIB}/mutagen/_tools/mid3iconv.pyo
+${PYSITELIB}/mutagen/_tools/mid3v2.py
+${PYSITELIB}/mutagen/_tools/mid3v2.pyc
+${PYSITELIB}/mutagen/_tools/mid3v2.pyo
+${PYSITELIB}/mutagen/_tools/moggsplit.py
+${PYSITELIB}/mutagen/_tools/moggsplit.pyc
+${PYSITELIB}/mutagen/_tools/moggsplit.pyo
+${PYSITELIB}/mutagen/_tools/mutagen_inspect.py
+${PYSITELIB}/mutagen/_tools/mutagen_inspect.pyc
+${PYSITELIB}/mutagen/_tools/mutagen_inspect.pyo
+${PYSITELIB}/mutagen/_tools/mutagen_pony.py
+${PYSITELIB}/mutagen/_tools/mutagen_pony.pyc
+${PYSITELIB}/mutagen/_tools/mutagen_pony.pyo
 ${PYSITELIB}/mutagen/_util.py
 ${PYSITELIB}/mutagen/_util.pyc
 ${PYSITELIB}/mutagen/_util.pyo
@@ -48,6 +96,9 @@ ${PYSITELIB}/mutagen/asf/_objects.pyo
 ${PYSITELIB}/mutagen/asf/_util.py
 ${PYSITELIB}/mutagen/asf/_util.pyc
 ${PYSITELIB}/mutagen/asf/_util.pyo
+${PYSITELIB}/mutagen/dsf.py
+${PYSITELIB}/mutagen/dsf.pyc
+${PYSITELIB}/mutagen/dsf.pyo
 ${PYSITELIB}/mutagen/easyid3.py
 ${PYSITELIB}/mutagen/easyid3.pyc
 ${PYSITELIB}/mutagen/easyid3.pyo
@@ -60,12 +111,21 @@ ${PYSITELIB}/mutagen/flac.pyo
 ${PYSITELIB}/mutagen/id3/__init__.py
 ${PYSITELIB}/mutagen/id3/__init__.pyc
 ${PYSITELIB}/mutagen/id3/__init__.pyo
+${PYSITELIB}/mutagen/id3/_file.py
+${PYSITELIB}/mutagen/id3/_file.pyc
+${PYSITELIB}/mutagen/id3/_file.pyo
 ${PYSITELIB}/mutagen/id3/_frames.py
 ${PYSITELIB}/mutagen/id3/_frames.pyc
 ${PYSITELIB}/mutagen/id3/_frames.pyo
+${PYSITELIB}/mutagen/id3/_id3v1.py
+${PYSITELIB}/mutagen/id3/_id3v1.pyc
+${PYSITELIB}/mutagen/id3/_id3v1.pyo
 ${PYSITELIB}/mutagen/id3/_specs.py
 ${PYSITELIB}/mutagen/id3/_specs.pyc
 ${PYSITELIB}/mutagen/id3/_specs.pyo
+${PYSITELIB}/mutagen/id3/_tags.py
+${PYSITELIB}/mutagen/id3/_tags.pyc
+${PYSITELIB}/mutagen/id3/_tags.pyo
 ${PYSITELIB}/mutagen/id3/_util.py
 ${PYSITELIB}/mutagen/id3/_util.pyc
 ${PYSITELIB}/mutagen/id3/_util.pyo
@@ -75,9 +135,12 @@ ${PYSITELIB}/mutagen/m4a.pyo
 ${PYSITELIB}/mutagen/monkeysaudio.py
 ${PYSITELIB}/mutagen/monkeysaudio.pyc
 ${PYSITELIB}/mutagen/monkeysaudio.pyo
-${PYSITELIB}/mutagen/mp3.py
-${PYSITELIB}/mutagen/mp3.pyc
-${PYSITELIB}/mutagen/mp3.pyo
+${PYSITELIB}/mutagen/mp3/__init__.py
+${PYSITELIB}/mutagen/mp3/__init__.pyc
+${PYSITELIB}/mutagen/mp3/__init__.pyo
+${PYSITELIB}/mutagen/mp3/_util.py
+${PYSITELIB}/mutagen/mp3/_util.pyc
+${PYSITELIB}/mutagen/mp3/_util.pyo
 ${PYSITELIB}/mutagen/mp4/__init__.py
 ${PYSITELIB}/mutagen/mp4/__init__.pyc
 ${PYSITELIB}/mutagen/mp4/__init__.pyo
@@ -114,6 +177,9 @@ ${PYSITELIB}/mutagen/oggvorbis.pyo
 ${PYSITELIB}/mutagen/optimfrog.py
 ${PYSITELIB}/mutagen/optimfrog.pyc
 ${PYSITELIB}/mutagen/optimfrog.pyo
+${PYSITELIB}/mutagen/smf.py
+${PYSITELIB}/mutagen/smf.pyc
+${PYSITELIB}/mutagen/smf.pyo
 ${PYSITELIB}/mutagen/trueaudio.py
 ${PYSITELIB}/mutagen/trueaudio.pyc
 ${PYSITELIB}/mutagen/trueaudio.pyo
diff --git a/audio/py-mutagen/distinfo b/audio/py-mutagen/distinfo
index 253b6ab1d596..fb405ef7b3ac 100644
--- a/audio/py-mutagen/distinfo
+++ b/audio/py-mutagen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 09:53:40 wiz Exp $
+$NetBSD: distinfo,v 1.12 2017/05/09 13:14:32 leot Exp $
 
-SHA1 (mutagen-1.31.tar.gz) = 09721ea47b9ebdf0c76a7b2e07cdd50c23993e10
-RMD160 (mutagen-1.31.tar.gz) = 3573207b601a31e0dcdb9440c59fbec21e2b5417
-SHA512 (mutagen-1.31.tar.gz) = d603afa049e2223dc1050ee26101add4150f8ca57fcee1bbbfd1233276b15fda5972d58e8472135396e54f2778219462619fbec8dddb97c35a7fb7638fec0c23
-Size (mutagen-1.31.tar.gz) = 897785 bytes
-SHA1 (patch-aa) = 05453c544b1d242000b1c897c9a42450d86ca4cb
+SHA1 (mutagen-1.37.tar.gz) = 973e29c3b27f2b99ac5b18899ef07c2c8c9b035e
+RMD160 (mutagen-1.37.tar.gz) = 8a8bce64ed57d7637a590e163a7e27f329a6a297
+SHA512 (mutagen-1.37.tar.gz) = f1bdd3d56526be718642d6599e7353879dc7e16f3d8758ff0221224310f5952cdc097dd70202be4b93c3a661f83b4f0d3e7730464f077d89614883571b80b180
+Size (mutagen-1.37.tar.gz) = 912600 bytes
+SHA1 (patch-aa) = a43b06c204080283674a4afacafbc356fbaab021
diff --git a/audio/py-mutagen/patches/patch-aa b/audio/py-mutagen/patches/patch-aa
index cc082366da9f..1f27a8817afa 100644
--- a/audio/py-mutagen/patches/patch-aa
+++ b/audio/py-mutagen/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.7 2015/11/04 09:53:40 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2017/05/09 13:14:32 leot Exp $
 
-Do not install the command line tools. -- drochner, 2009
+Do not install the command line tools. The tools are provided separately by
+mutagen-tools package.
 
---- setup.py.orig	2014-11-26 13:18:57.000000000 +0000
+--- setup.py.orig	2017-02-24 13:15:32.000000000 +0000
 +++ setup.py
-@@ -256,15 +256,15 @@ if __name__ == "__main__":
-             'Topic :: Multimedia :: Sound/Audio',
+@@ -267,14 +267,14 @@ if __name__ == "__main__":
+             "mutagen._senf",
+             "mutagen._tools",
            ],
-           packages=["mutagen", "mutagen.id3", "mutagen.mp4", "mutagen.asf"],
 -          data_files=data_files,
 -          scripts=[os.path.join("tools", name) for name in [
 -            "mid3cp",
@@ -17,15 +18,14 @@ Do not install the command line tools. -- drochner, 2009
 -            "mutagen-inspect",
 -            "mutagen-pony",
 -          ]],
-+#          data_files=data_files,
-+#          scripts=[os.path.join("tools", name) for name in [
-+#            "mid3cp",
-+#            "mid3iconv",
-+#            "mid3v2",
-+#            "moggsplit",
-+#            "mutagen-inspect",
-+#            "mutagen-pony",
-+#          ]],
-           long_description="""\
- Mutagen is a Python module to handle audio metadata. It supports ASF,
- FLAC, M4A, Monkey's Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg
++#         data_files=data_files,
++#         scripts=[os.path.join("tools", name) for name in [
++#           "mid3cp",
++#           "mid3iconv",
++#           "mid3v2",
++#           "moggsplit",
++#           "mutagen-inspect",
++#           "mutagen-pony",
++#         ]],
+           long_description=long_description,
+     )