diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index b7eca8976fd5..733a0af7cb4a 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	highlight
-PORTVERSION=	2.6.10
+PORTVERSION=	2.6.12
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.andre-simon.de/zip/
@@ -26,7 +26,9 @@ MAN1=		${PORTNAME}.1
 MANCOMPRESSED=	yes
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	*
+PORTDOCS=	ChangeLog INSTALL README README_DE README_INDENT \
+		README_LANGLIST README_REGEX TODO
+
 .endif
 
 .include <bsd.port.pre.mk>
@@ -52,14 +54,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/themes/* ${DATADIR}/themes
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in AUTHORS ChangeLog INSTALL README README_DE README_LANGLIST \
-	README_INDENT README_REGEX TODO
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	${TAR} -C ${WRKSRC}/examples -cf - . | \
-		${TAR} -C  ${EXAMPLESDIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
 
 post-install:
diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo
index 12b2408446ad..8bd169ff1476 100644
--- a/textproc/highlight/distinfo
+++ b/textproc/highlight/distinfo
@@ -1,3 +1,3 @@
-MD5 (highlight-2.6.10.tar.gz) = 2f528053278cc7fe104516623e948cef
-SHA256 (highlight-2.6.10.tar.gz) = b00f254cc3080c7bdcb092e6805bb28415a246603d2ba0d3dc61e5248582db6c
-SIZE (highlight-2.6.10.tar.gz) = 451124
+MD5 (highlight-2.6.12.tar.gz) = 5ab9c50e537c199f359a7d9610aacc7f
+SHA256 (highlight-2.6.12.tar.gz) = a660d2f0725fccf81ac8fa634d9f74460e2dc061be6e6e2e7b34485e3d1a00cc
+SIZE (highlight-2.6.12.tar.gz) = 459927