diff --git a/math/emc2/Makefile b/math/emc2/Makefile
index 5252a0f64f77..8475e5e2ee99 100644
--- a/math/emc2/Makefile
+++ b/math/emc2/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	emc2
 PORTVERSION=	2.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math science
 MASTER_SITES=	http://www-c.inria.fr/gamma/cdrom/ftp/emc2/ \
 		http://www-rocq1.inria.fr/gamma/cdrom/ftp/emc2/
+DISTFILES=	${PORTNAME}${EXTRACT_SUFX}
 .if !defined(NOPORTDOCS)
-DISTFILES=	${PORTNAME}${EXTRACT_SUFX}	\
-		${PORTNAME}-doc-en.ps.gz ${PORTNAME}-doc-fr.ps.gz
+DISTFILES+=	${PORTNAME}-doc-en.ps.gz ${PORTNAME}-doc-fr.ps.gz
 EXTRACT_ONLY=	${PORTNAME}${EXTRACT_SUFX}
 .endif
 
@@ -37,10 +37,12 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCSDIR}
-.for doc in ${PORTNAME}-doc-en.ps.gz ${PORTNAME}-doc-fr.ps.gz
-	@${INSTALL_DATA} ${DISTDIR}/${doc} ${DOCSDIR}
-.endfor
+	@${GZCAT} ${DISTDIR}/${PORTNAME}-doc-en.ps.gz > ${DOCSDIR}/${PORTNAME}-en.ps
+	@${GZCAT} ${DISTDIR}/${PORTNAME}-doc-fr.ps.gz > ${DOCSDIR}/${PORTNAME}-fr.ps
 	@${ECHO_MSG} "===>  Documentation installed in ${DOCSDIR}."
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@${ECHO_MSG} "===>  Examples installed in ${EXAMPLESDIR}."
 .endif
diff --git a/math/emc2/pkg-plist b/math/emc2/pkg-plist
index 560727d4307a..c417f2d3b5e6 100644
--- a/math/emc2/pkg-plist
+++ b/math/emc2/pkg-plist
@@ -1,21 +1,21 @@
 bin/emc2
 bin/prf_f3d
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/emc2-doc-en.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/emc2-doc-fr.ps.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/c.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/cooler.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/culot1.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/demi_carre.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/fissure.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/gruyere.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/houman.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/levier.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/mos.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/naca.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/naca.pts
-%%PORTDOCS%%%%EXAMPLESDIR%%/naca012.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/q.emc2_bd
-%%PORTDOCS%%%%EXAMPLESDIR%%/rotor.emc2_bd
+%%PORTDOCS%%%%DOCSDIR%%/emc2-en.ps
+%%PORTDOCS%%%%DOCSDIR%%/emc2-fr.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cooler.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/culot1.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demi_carre.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fissure.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gruyere.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/houman.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/levier.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/naca.f
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/naca.pts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/naca012.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q.emc2_bd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rotor.emc2_bd
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%