diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index c4b9664b517..05c6682f03c 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -1,7 +1,6 @@
 COMMENT =		spreadsheet-like audio file tagger
 
-MODPY_EGG_VERSION =	2.1.1
-REVISION =		1
+MODPY_EGG_VERSION =	2.2.0
 DISTNAME =		puddletag-${MODPY_EGG_VERSION}
 
 CATEGORIES =		audio
@@ -15,6 +14,7 @@ MODPY_PI =		Yes
 
 MODULES =		lang/python
 MODPY_PYBUILD =		setuptools
+NO_TEST =		Yes
 
 RUN_DEPENDS =		audio/py-mutagen${MODPY_FLAVOR} \
 			devel/desktop-file-utils \
@@ -22,10 +22,4 @@ RUN_DEPENDS =		audio/py-mutagen${MODPY_FLAVOR} \
 			devel/py-parsing${MODPY_FLAVOR} \
 			x11/py-qt5${MODPY_FLAVOR}
 
-# Author didn't write tests
-NO_TEST =		Yes
-
-post-install:
-	mv ${PREFIX}/share/man/man1/puddletag.1 ${PREFIX}/man/man1/
-
 .include <bsd.port.mk>
diff --git a/audio/puddletag/distinfo b/audio/puddletag/distinfo
index 76430cb0284..047be9e1aec 100644
--- a/audio/puddletag/distinfo
+++ b/audio/puddletag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puddletag-2.1.1.tar.gz) = 6XrEVegyFcAKrXVJlD2mXCm1AQTqXvbR3qenzLfVto0=
-SIZE (puddletag-2.1.1.tar.gz) = 705779
+SHA256 (puddletag-2.2.0.tar.gz) = aoG9t8ciIg9MnUNEXS6fL7FcPgUcpQVjnEQw/O1ZSoY=
+SIZE (puddletag-2.2.0.tar.gz) = 731787
diff --git a/audio/puddletag/patches/patch-setup_py b/audio/puddletag/patches/patch-setup_py
new file mode 100644
index 00000000000..254b5f247d7
--- /dev/null
+++ b/audio/puddletag/patches/patch-setup_py
@@ -0,0 +1,10 @@
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -50,5 +50,5 @@ setup(
+     install_requires=_runtime_dependencies(),
+     data_files=[('share/pixmaps/', ['puddletag.png', ]),
+                 ('share/applications/', ['puddletag.desktop', ]),
+-                ('share/man/man1/', ['puddletag.1', ])]
++                ('man/man1/', ['puddletag.1', ])]
+ )
diff --git a/audio/puddletag/pkg/PLIST b/audio/puddletag/pkg/PLIST
index de851bcce57..9aa01ae496c 100644
--- a/audio/puddletag/pkg/PLIST
+++ b/audio/puddletag/pkg/PLIST
@@ -190,10 +190,13 @@ lib/python${MODPY_VERSION}/site-packages/puddlestuff/shortcutsettings.py
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagmodel.py
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/CDDB.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/TagSource.py
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}CDDB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}CDDB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}TagSource.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}TagSource.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/${MODPY_PYCACHE}_acoustid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -248,8 +251,6 @@ lib/python${MODPY_VERSION}/site-packages/puddletag-${MODPY_EGG_VERSION}.dist-inf
 lib/python${MODPY_VERSION}/site-packages/puddletag-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 @man man/man1/puddletag.1
 share/applications/puddletag.desktop
-@comment share/man/
-@comment share/man/man1/
 share/pixmaps/
 share/pixmaps/puddletag.png
 @tag update-desktop-database