diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 59440ae0cd6..b1b3299d75a 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/11 10:50:03 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2014/01/20 17:06:31 edd Exp $
 
 COMMENT=	documentation system for C, C++, IDL and Java
 
 DISTNAME=	doc++-3.4.10
-REVISION =	2
+REVISION =	3
 CATEGORIES=	devel
 
 HOMEPAGE=	http://docpp.sourceforge.net/
@@ -27,8 +27,11 @@ MODULES=	devel/gettext
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/doc++
 	${INSTALL_DATA} ${WRKSRC}/doc/manual/html/* ${PREFIX}/share/doc/doc++
-	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf/tex/latex/doc++
+	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf-local/tex/latex/doc++
 	${INSTALL_DATA} ${WRKSRC}/doc/*.sty \
-		${PREFIX}/share/texmf/tex/latex/doc++
+		${PREFIX}/share/texmf-local/tex/latex/doc++
+# Remove stuff that collides with gettext and libiconv
+	rm ${PREFIX}/share/locale/locale.alias
+	rm ${PREFIX}/lib/charset.alias
 
 .include <bsd.port.mk>
diff --git a/devel/doc++/pkg/PLIST b/devel/doc++/pkg/PLIST
index 2afce402241..dda709f0cb9 100644
--- a/devel/doc++/pkg/PLIST
+++ b/devel/doc++/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.8 2007/08/11 10:44:24 jasper Exp $
-bin/doc++
-bin/docify
-bin/promote
+@comment $OpenBSD: PLIST,v 1.9 2014/01/20 17:06:31 edd Exp $
+@bin bin/doc++
+@bin bin/docify
+@bin bin/promote
 share/doc/doc++/
 share/doc/doc++/ClassGraph.class
 share/doc/doc++/ClassGraphPanel.class
@@ -40,13 +40,14 @@ share/locale/fr/LC_MESSAGES/doc++.mo
 share/locale/ja/LC_MESSAGES/doc++.mo
 share/locale/ro/LC_MESSAGES/doc++.mo
 share/locale/ru/LC_MESSAGES/doc++.mo
-share/texmf/tex/
-share/texmf/tex/latex/
-share/texmf/tex/latex/doc++/
-share/texmf/tex/latex/doc++/docxx-br.sty
-share/texmf/tex/latex/doc++/docxx-fr.sty
-share/texmf/tex/latex/doc++/docxx-ja.sty
-share/texmf/tex/latex/doc++/docxx-ro.sty
-share/texmf/tex/latex/doc++/docxx.sty
+share/texmf-local/
+share/texmf-local/tex/
+share/texmf-local/tex/latex/
+share/texmf-local/tex/latex/doc++/
+share/texmf-local/tex/latex/doc++/docxx-br.sty
+share/texmf-local/tex/latex/doc++/docxx-fr.sty
+share/texmf-local/tex/latex/doc++/docxx-ja.sty
+share/texmf-local/tex/latex/doc++/docxx-ro.sty
+share/texmf-local/tex/latex/doc++/docxx.sty
 @exec mktexlsr > /dev/null 2>&1
-@unexec mktexlsr > /dev/null 2>&1
+@unexec-delete mktexlsr > /dev/null 2>&1