diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile
index ff95e0132951..ce5866eb007d 100644
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	cxx
-PORTVERSION=	5.3.2
+PORTVERSION=	5.3.4
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,9 +21,13 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/PyCXX.html ${DOCSDIR}
+PORTDOCS=	*
 .endif
 
+post-install:
+.	if !defined(NOPORTDOCS)
+		@${MKDIR} ${DOCSDIR}
+		${INSTALL_DATA} ${WRKSRC}/Doc/PyCXX.html ${DOCSDIR}
+.	endif
+
 .include <bsd.port.mk>
diff --git a/devel/py-cxx/distinfo b/devel/py-cxx/distinfo
index 692be41f3c79..3aa85dd2ee47 100644
--- a/devel/py-cxx/distinfo
+++ b/devel/py-cxx/distinfo
@@ -1,2 +1,2 @@
-MD5 (pycxx_5_3_2.tar.gz) = 49c00db158e961b076ac9adcdcf5bd46
-SIZE (pycxx_5_3_2.tar.gz) = 60687
+MD5 (pycxx_5_3_4.tar.gz) = 3c9bde0180442625f0c31cbaae34484c
+SIZE (pycxx_5_3_4.tar.gz) = 63897
diff --git a/devel/py-cxx/pkg-plist b/devel/py-cxx/pkg-plist
index c5ddf7363b95..63de52f4a951 100644
--- a/devel/py-cxx/pkg-plist
+++ b/devel/py-cxx/pkg-plist
@@ -3,16 +3,14 @@ include/%%PYTHON_VERSION%%/CXX/Exception.hxx
 include/%%PYTHON_VERSION%%/CXX/Extensions.hxx
 include/%%PYTHON_VERSION%%/CXX/IndirectPythonInterface.hxx
 include/%%PYTHON_VERSION%%/CXX/Objects.hxx
+include/%%PYTHON_VERSION%%/CXX/Version.hxx
+@dirrm include/%%PYTHON_VERSION%%/CXX
 %%PYTHON_SITELIBDIR%%/CXX/__init__.py
 %%PYTHON_SITELIBDIR%%/CXX/__init__.pyc
 %%PYTHON_SITELIBDIR%%/CXX/__init__.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/CXX
 share/%%PYTHON_VERSION%%/CXX/IndirectPythonInterface.cxx
 share/%%PYTHON_VERSION%%/CXX/cxx_extensions.cxx
 share/%%PYTHON_VERSION%%/CXX/cxxextensions.c
 share/%%PYTHON_VERSION%%/CXX/cxxsupport.cxx
-%%PORTDOCS%%%%DOCSDIR%%/PyCXX.html
-@dirrm %%PYTHON_SITELIBDIR%%/CXX
-@dirrm include/%%PYTHON_VERSION%%/CXX
 @dirrm share/%%PYTHON_VERSION%%/CXX
-@unexec rmdir %D/share/%%PYTHON_VERSION%% >/dev/null 2>&1 || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%