diff --git a/audio/py-mpd2/Makefile b/audio/py-mpd2/Makefile
index c87f52425447..aa61aa557d80 100644
--- a/audio/py-mpd2/Makefile
+++ b/audio/py-mpd2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpd2
-PORTVERSION=	0.5.1
+PORTVERSION=	0.5.2
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-${PORTNAME}-${PORTVERSION}
@@ -15,7 +15,7 @@ NO_STAGE=	yes
 GH_ACCOUNT=	Mic92
 GH_PROJECT=	python-${PORTNAME}
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	f8d5946
+GH_COMMIT=	df508d4
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
@@ -25,7 +25,10 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-PORTDOCS=	commands.rst
+PORTDOCS_1=	index.rst changes.rst
+PORTDOCS_2=	topics/advanced.rst topics/commands.rst \
+		topics/getting-started.rst topics/logging.rst
+PORTDOCS=	${PORTDOCS_1} ${PORTDOCS_2}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 PORTEXAMPLES=	locking.py logger.py
 
@@ -33,15 +36,18 @@ PORTEXAMPLES=	locking.py logger.py
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/topics
+.for f in ${PORTDOCS_1}
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
+.endfor
+.for f in ${PORTDOCS_2}
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/topics
 .endfor
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
-	@${INSTALL_SCRIPT} ${WRKSRC}/examples/${f} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/${f} ${EXAMPLESDIR}
 .endfor
 .endif
 
diff --git a/audio/py-mpd2/distinfo b/audio/py-mpd2/distinfo
index 8c741d50946b..835b9e2b56e7 100644
--- a/audio/py-mpd2/distinfo
+++ b/audio/py-mpd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-mpd2-0.5.1.tar.gz) = f42be7295f97321a70aea66a42f5260f18eed8a267211304d44b128ae0abb72f
-SIZE (python-mpd2-0.5.1.tar.gz) = 29593
+SHA256 (python-mpd2-0.5.2.tar.gz) = d39e9ab589b413e340630269486d12bfc3cec44dc92977c4b64b8d73cea4034e
+SIZE (python-mpd2-0.5.2.tar.gz) = 35170
diff --git a/audio/py-mpd2/pkg-plist b/audio/py-mpd2/pkg-plist
index ddf68a1c022f..8990d9fd9bf8 100644
--- a/audio/py-mpd2/pkg-plist
+++ b/audio/py-mpd2/pkg-plist
@@ -1 +1,2 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/topics