diff --git a/java/linux-ibm-jdk13/Makefile b/java/linux-ibm-jdk13/Makefile
index 06c868042b6b..1c9a1d887a65 100644
--- a/java/linux-ibm-jdk13/Makefile
+++ b/java/linux-ibm-jdk13/Makefile
@@ -16,8 +16,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	perky@python.or.kr
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/japanese/truetypefonts
+RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/japanese/truetypefonts
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-SDK//}
 PLIST_SUB+=	TARGET_PREFIX=${TARGET_PREFIX:S/^${PREFIX}\///}
@@ -60,6 +62,7 @@ do-install:
 	${LOCALBASE}/bin/registervm "${TARGET_PREFIX}/bin/java # IBM-JDK${PORTVERSION}_${PORTREVISION}"
 
 post-install:
+	${LN} -sf ${X11BASE}/lib/X11/fonts/TrueType/wa*ttf ${TARGET_PREFIX}/jre/lib/fonts/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/java/linux-ibm-jdk13/files/patch-aa b/java/linux-ibm-jdk13/files/patch-aa
new file mode 100644
index 000000000000..ad688836115c
--- /dev/null
+++ b/java/linux-ibm-jdk13/files/patch-aa
@@ -0,0 +1,52 @@
+--- jre/lib/fonts/fonts.dir.orig	Mon Oct 29 15:18:21 2001
++++ jre/lib/fonts/fonts.dir	Mon Oct 29 15:18:54 2001
+@@ -1,4 +1,4 @@
+-227
++267
+ tnrwt_j.ttf -monotype-timesnewromanwt-medium-r-normal--0-0-0-0-p-0-iso10646-1
+ tnrwt_j.ttf -monotype-timesnewromanwt-medium-r-normal--0-0-0-0-p-0-iso8859-15
+ tnrwt_j.ttf -monotype-timesnewromanwt-medium-r-normal--0-0-0-0-p-0-iso8859-10
+@@ -226,3 +226,43 @@
+ Thonburi.ttf -ibm-thonburi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+ Thonburi.ttf -ibm-thonburi-medium-r-normal--0-0-0-0-p-0-tis620-0
+ Thonburi.ttf -ibm-thonburi-medium-r-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1
++ai=0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1
++ai=0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1
++sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-ro-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-o-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-ri-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-i-normal--0-0-0-0-p-0-iso8859-1
++ab=y:sw=0.9640625:sw=1.205078125:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-r-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1
++ai=0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1
++ai=0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1
++sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-ro-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-o-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-ri-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-i-normal--0-0-0-0-p-0-iso8859-1
++ab=y:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-r-normal--0-0-0-0-p-0-iso8859-1
diff --git a/java/linux-ibm-jdk13/files/patch-ab b/java/linux-ibm-jdk13/files/patch-ab
new file mode 100644
index 000000000000..92af9bf787e8
--- /dev/null
+++ b/java/linux-ibm-jdk13/files/patch-ab
@@ -0,0 +1,52 @@
+--- jre/lib/fonts/fonts.scale.orig	Mon Oct 29 15:19:22 2001
++++ jre/lib/fonts/fonts.scale	Mon Oct 29 15:03:56 2001
+@@ -1,4 +1,4 @@
+-227
++267
+ tnrwt_j.ttf -monotype-timesnewromanwt-medium-r-normal--0-0-0-0-p-0-iso10646-1
+ tnrwt_j.ttf -monotype-timesnewromanwt-medium-r-normal--0-0-0-0-p-0-iso8859-15
+ tnrwt_j.ttf -monotype-timesnewromanwt-medium-r-normal--0-0-0-0-p-0-iso8859-10
+@@ -226,3 +226,43 @@
+ Thonburi.ttf -ibm-thonburi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+ Thonburi.ttf -ibm-thonburi-medium-r-normal--0-0-0-0-p-0-tis620-0
+ Thonburi.ttf -ibm-thonburi-medium-r-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1
++ai=0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1
++ai=0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1
++sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.2:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.4:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:sw=1.205078125:watanabe-mincho.ttf -watanabe-mincho-obold-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-ro-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.2:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-o-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-ri-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.4:sw=0.9640625:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-i-normal--0-0-0-0-p-0-iso8859-1
++ab=y:sw=0.9640625:sw=1.205078125:bw=0.625:watanabe-mincho.ttf -watanabe-mincho-obold-r-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ai=-0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1
++ai=0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1
++ai=-0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1
++ai=0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1
++sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.2:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-o-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=0.4:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-i-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:sw=1.205078125:wadalab-gothic.ttf -wadalab-gothic-obold-r-normal--0-0-0-0-p-0-jisx0208.1983-0
++ab=y:ai=-0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-ro-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.2:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-o-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=-0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-ri-normal--0-0-0-0-p-0-iso8859-1
++ab=y:ai=0.4:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-i-normal--0-0-0-0-p-0-iso8859-1
++ab=y:sw=0.9640625:bw=0.625:wadalab-gothic.ttf -wadalab-gothic-obold-r-normal--0-0-0-0-p-0-iso8859-1
diff --git a/java/linux-ibm-jdk13/pkg-plist b/java/linux-ibm-jdk13/pkg-plist
index 96b5dd51ddbe..c35c9e87644c 100644
--- a/java/linux-ibm-jdk13/pkg-plist
+++ b/java/linux-ibm-jdk13/pkg-plist
@@ -119,6 +119,7 @@
 %%TARGET_PREFIX%%/jre/lib/i18n.jar
 %%TARGET_PREFIX%%/jre/lib/fonts/fonts.scale
 %%TARGET_PREFIX%%/jre/lib/fonts/fonts.dir
+@unexec rm %B/*.orig
 %%TARGET_PREFIX%%/jre/lib/fonts/Thoni___.ttf
 %%TARGET_PREFIX%%/jre/lib/fonts/Thonburi.ttf
 %%TARGET_PREFIX%%/jre/lib/fonts/Thonbi__.ttf
@@ -139,6 +140,8 @@
 %%TARGET_PREFIX%%/jre/lib/fonts/Courtbi_.ttf
 %%TARGET_PREFIX%%/jre/lib/fonts/Courtb__.ttf
 %%TARGET_PREFIX%%/jre/lib/fonts/Court___.ttf
+@unexec rm %B/wa*ttf
+@exec ln -sf %%X11BASE%%/lib/X11/fonts/TrueType/wa*ttf %B/
 %%TARGET_PREFIX%%/jre/lib/font.properties.zh_TW.2.2.18-2
 %%TARGET_PREFIX%%/jre/lib/font.properties.zh_TW
 %%TARGET_PREFIX%%/jre/lib/font.properties.zh.2.2.18-2