diff --git a/print/ghostscript-gnu-commfont/Makefile b/print/ghostscript-gnu-commfont/Makefile
index d14d45f080c7..fccd3b8494c4 100644
--- a/print/ghostscript-gnu-commfont/Makefile
+++ b/print/ghostscript-gnu-commfont/Makefile
@@ -6,7 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMFONT=	yes
 
diff --git a/print/ghostscript-gnu-commfont/Makefile.common b/print/ghostscript-gnu-commfont/Makefile.common
index 30999ec27d80..c5c43daf8212 100644
--- a/print/ghostscript-gnu-commfont/Makefile.common
+++ b/print/ghostscript-gnu-commfont/Makefile.common
@@ -1,3 +1,4 @@
+# $FreeBSD$
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
 CATEGORIES=	print
diff --git a/print/ghostscript-gnu-commfont/pkg-plist.common b/print/ghostscript-gnu-commfont/pkg-plist.common
index 7c612b3c5c92..fbf526f151a6 100644
--- a/print/ghostscript-gnu-commfont/pkg-plist.common
+++ b/print/ghostscript-gnu-commfont/pkg-plist.common
@@ -182,7 +182,12 @@
 %%GSRES_DIR%%/CMap/HK-RKSJ-H
 %%GSRES_DIR%%/CMap/KSC2-RKSJ-H
 %%GSRES_DIR%%/CMap/TCVN-RKSJ-H
+%%GSRES_DIR%%/CMap/Adobe-CNS1-UCS2
+%%GSRES_DIR%%/CMap/Adobe-GB1-UCS2
+%%GSRES_DIR%%/CMap/Adobe-Japan1-UCS2
+%%GSRES_DIR%%/CMap/Adobe-Korea1-UCS2
 @dirrm %%GSRES_DIR%%/CMap
+@dirrmtry %%GSRES_DIR%%
 @exec /bin/mv %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed
 @exec /usr/bin/sed -e 's:^%.*(a4):(a4):g' %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed > %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
 @unexec /bin/rm %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile
index d14d45f080c7..fccd3b8494c4 100644
--- a/print/ghostscript7-commfont/Makefile
+++ b/print/ghostscript7-commfont/Makefile
@@ -6,7 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMFONT=	yes
 
diff --git a/print/ghostscript7-commfont/Makefile.common b/print/ghostscript7-commfont/Makefile.common
index 30999ec27d80..c5c43daf8212 100644
--- a/print/ghostscript7-commfont/Makefile.common
+++ b/print/ghostscript7-commfont/Makefile.common
@@ -1,3 +1,4 @@
+# $FreeBSD$
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
 CATEGORIES=	print
diff --git a/print/ghostscript7-commfont/pkg-plist.common b/print/ghostscript7-commfont/pkg-plist.common
index 7c612b3c5c92..fbf526f151a6 100644
--- a/print/ghostscript7-commfont/pkg-plist.common
+++ b/print/ghostscript7-commfont/pkg-plist.common
@@ -182,7 +182,12 @@
 %%GSRES_DIR%%/CMap/HK-RKSJ-H
 %%GSRES_DIR%%/CMap/KSC2-RKSJ-H
 %%GSRES_DIR%%/CMap/TCVN-RKSJ-H
+%%GSRES_DIR%%/CMap/Adobe-CNS1-UCS2
+%%GSRES_DIR%%/CMap/Adobe-GB1-UCS2
+%%GSRES_DIR%%/CMap/Adobe-Japan1-UCS2
+%%GSRES_DIR%%/CMap/Adobe-Korea1-UCS2
 @dirrm %%GSRES_DIR%%/CMap
+@dirrmtry %%GSRES_DIR%%
 @exec /bin/mv %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed
 @exec /usr/bin/sed -e 's:^%.*(a4):(a4):g' %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed > %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
 @unexec /bin/rm %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps