diff --git a/SysBuild/xserv/font-adobe-100dpi b/SysBuild/xserv/font-adobe-100dpi
index a34ed3c..a0d274c 100644
--- a/SysBuild/xserv/font-adobe-100dpi
+++ b/SysBuild/xserv/font-adobe-100dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-adobe-75dpi b/SysBuild/xserv/font-adobe-75dpi
index 912a170..204084d 100644
--- a/SysBuild/xserv/font-adobe-75dpi
+++ b/SysBuild/xserv/font-adobe-75dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-adobe-utopia-100dpi b/SysBuild/xserv/font-adobe-utopia-100dpi
index 356b95e..45d4a4f 100644
--- a/SysBuild/xserv/font-adobe-utopia-100dpi
+++ b/SysBuild/xserv/font-adobe-utopia-100dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-adobe-utopia-75dpi b/SysBuild/xserv/font-adobe-utopia-75dpi
index 7907758..6071f16 100644
--- a/SysBuild/xserv/font-adobe-utopia-75dpi
+++ b/SysBuild/xserv/font-adobe-utopia-75dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-adobe-utopia-type1 b/SysBuild/xserv/font-adobe-utopia-type1
index c4a585d..cebf14e 100644
--- a/SysBuild/xserv/font-adobe-utopia-type1
+++ b/SysBuild/xserv/font-adobe-utopia-type1
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-arabic-misc b/SysBuild/xserv/font-arabic-misc
index 3367763..7ea47d4 100644
--- a/SysBuild/xserv/font-arabic-misc
+++ b/SysBuild/xserv/font-arabic-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bh-100dpi b/SysBuild/xserv/font-bh-100dpi
index 14b7851..4032ecd 100644
--- a/SysBuild/xserv/font-bh-100dpi
+++ b/SysBuild/xserv/font-bh-100dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bh-75dpi b/SysBuild/xserv/font-bh-75dpi
index b8b25d9..10e35d8 100644
--- a/SysBuild/xserv/font-bh-75dpi
+++ b/SysBuild/xserv/font-bh-75dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bh-lucidatypewriter-100dpi b/SysBuild/xserv/font-bh-lucidatypewriter-100dpi
index 1576d84..83fed9c 100644
--- a/SysBuild/xserv/font-bh-lucidatypewriter-100dpi
+++ b/SysBuild/xserv/font-bh-lucidatypewriter-100dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bh-lucidatypewriter-75dpi b/SysBuild/xserv/font-bh-lucidatypewriter-75dpi
index 60511e4..d89b918 100644
--- a/SysBuild/xserv/font-bh-lucidatypewriter-75dpi
+++ b/SysBuild/xserv/font-bh-lucidatypewriter-75dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bh-ttf b/SysBuild/xserv/font-bh-ttf
index 19af1ee..f814189 100644
--- a/SysBuild/xserv/font-bh-ttf
+++ b/SysBuild/xserv/font-bh-ttf
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bh-type1 b/SysBuild/xserv/font-bh-type1
index ab67395..30379a9 100644
--- a/SysBuild/xserv/font-bh-type1
+++ b/SysBuild/xserv/font-bh-type1
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bitstream-100dpi b/SysBuild/xserv/font-bitstream-100dpi
index 86a062d..c8ed29c 100644
--- a/SysBuild/xserv/font-bitstream-100dpi
+++ b/SysBuild/xserv/font-bitstream-100dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bitstream-75dpi b/SysBuild/xserv/font-bitstream-75dpi
index ed591cd..ff7b868 100644
--- a/SysBuild/xserv/font-bitstream-75dpi
+++ b/SysBuild/xserv/font-bitstream-75dpi
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bitstream-speedo b/SysBuild/xserv/font-bitstream-speedo
index f5fc50a..507de48 100644
--- a/SysBuild/xserv/font-bitstream-speedo
+++ b/SysBuild/xserv/font-bitstream-speedo
@@ -89,6 +89,12 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/share/fonts/X11
+	if [ -d $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts ]; then
+		mv $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/* $TMPROOT/usr/X11R7/share/fonts/X11
+		rm -r $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+		ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+	fi
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-bitstream-type1 b/SysBuild/xserv/font-bitstream-type1
index cf83290..3aca5c2 100644
--- a/SysBuild/xserv/font-bitstream-type1
+++ b/SysBuild/xserv/font-bitstream-type1
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-cronyx-cyrillic b/SysBuild/xserv/font-cronyx-cyrillic
index 8f1f052..7d8f8aa 100644
--- a/SysBuild/xserv/font-cronyx-cyrillic
+++ b/SysBuild/xserv/font-cronyx-cyrillic
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-cursor-misc b/SysBuild/xserv/font-cursor-misc
index 47db2fc..ad1348d 100644
--- a/SysBuild/xserv/font-cursor-misc
+++ b/SysBuild/xserv/font-cursor-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-daewoo-misc b/SysBuild/xserv/font-daewoo-misc
index c9ed93e..7139c6a 100644
--- a/SysBuild/xserv/font-daewoo-misc
+++ b/SysBuild/xserv/font-daewoo-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-dec-misc b/SysBuild/xserv/font-dec-misc
index 48a18b7..d71e71e 100644
--- a/SysBuild/xserv/font-dec-misc
+++ b/SysBuild/xserv/font-dec-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-ibm-type1 b/SysBuild/xserv/font-ibm-type1
index c0ed683..59d4ac4 100644
--- a/SysBuild/xserv/font-ibm-type1
+++ b/SysBuild/xserv/font-ibm-type1
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-isas-misc b/SysBuild/xserv/font-isas-misc
index 9646267..e0d1761 100644
--- a/SysBuild/xserv/font-isas-misc
+++ b/SysBuild/xserv/font-isas-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-jis-misc b/SysBuild/xserv/font-jis-misc
index 89d88a9..dfaa9d7 100644
--- a/SysBuild/xserv/font-jis-misc
+++ b/SysBuild/xserv/font-jis-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-micro-misc b/SysBuild/xserv/font-micro-misc
index 618e36b..087c13f 100644
--- a/SysBuild/xserv/font-micro-misc
+++ b/SysBuild/xserv/font-micro-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-misc-cyrillic b/SysBuild/xserv/font-misc-cyrillic
index 99e6cf7..295d818 100644
--- a/SysBuild/xserv/font-misc-cyrillic
+++ b/SysBuild/xserv/font-misc-cyrillic
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-misc-ethiopic b/SysBuild/xserv/font-misc-ethiopic
index 93a5b20..827fc8a 100644
--- a/SysBuild/xserv/font-misc-ethiopic
+++ b/SysBuild/xserv/font-misc-ethiopic
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-misc-misc b/SysBuild/xserv/font-misc-misc
index f99e67f..df9ab06 100644
--- a/SysBuild/xserv/font-misc-misc
+++ b/SysBuild/xserv/font-misc-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-mutt-misc b/SysBuild/xserv/font-mutt-misc
index 2e8055a..03cfc14 100644
--- a/SysBuild/xserv/font-mutt-misc
+++ b/SysBuild/xserv/font-mutt-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-schumacher-misc b/SysBuild/xserv/font-schumacher-misc
index db19d9d..9181f23 100644
--- a/SysBuild/xserv/font-schumacher-misc
+++ b/SysBuild/xserv/font-schumacher-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-screen-cyrillic b/SysBuild/xserv/font-screen-cyrillic
index 222ebe7..f6a51fb 100644
--- a/SysBuild/xserv/font-screen-cyrillic
+++ b/SysBuild/xserv/font-screen-cyrillic
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-sony-misc b/SysBuild/xserv/font-sony-misc
index ad3093d..d3ec8b4 100644
--- a/SysBuild/xserv/font-sony-misc
+++ b/SysBuild/xserv/font-sony-misc
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-sun-misc b/SysBuild/xserv/font-sun-misc
index 521f297..a10f19c 100644
--- a/SysBuild/xserv/font-sun-misc
+++ b/SysBuild/xserv/font-sun-misc
@@ -89,6 +89,12 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/share/fonts/X11
+	if [ -d $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts ]; then
+		mv $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/* $TMPROOT/usr/X11R7/share/fonts/X11
+		rm -r $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+		ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+	fi
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-util b/SysBuild/xserv/font-util
index f7abac8..cac98d9 100644
--- a/SysBuild/xserv/font-util
+++ b/SysBuild/xserv/font-util
@@ -102,6 +102,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-winitzki-cyrillic b/SysBuild/xserv/font-winitzki-cyrillic
index 5de4baa..ba2a02a 100644
--- a/SysBuild/xserv/font-winitzki-cyrillic
+++ b/SysBuild/xserv/font-winitzki-cyrillic
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/font-xfree86-type1 b/SysBuild/xserv/font-xfree86-type1
index 6cb9c5a..78c074a 100644
--- a/SysBuild/xserv/font-xfree86-type1
+++ b/SysBuild/xserv/font-xfree86-type1
@@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {
diff --git a/SysBuild/xserv/liberation-fonts-ttf b/SysBuild/xserv/liberation-fonts-ttf
index 3f368a4..beedfcd 100644
--- a/SysBuild/xserv/liberation-fonts-ttf
+++ b/SysBuild/xserv/liberation-fonts-ttf
@@ -76,8 +76,10 @@ premk() {
 }
 
 mk() {
-	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF
-	cp *.ttf $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF
+	mkdir -p $TMPROOT/usr/X11R7/share/fonts/X11/TTF
+	cp *.ttf $TMPROOT/usr/X11R7/share/fonts/X11/TTF
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }
 
 postmk() {