diff --git a/common/shlibs b/common/shlibs
index 508ff0e7f0a..39ea163292e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3536,6 +3536,7 @@ libcaf_openssl.so.0.18.0 zeek-4.0.0_1
 libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
+libzhuyin.so.13 libzhuyin-2.6.0_3
 libuhd.so.4.0.0 uhd-4.0.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
diff --git a/srcpkgs/libpinyin-common b/srcpkgs/libpinyin-common
new file mode 120000
index 00000000000..b9910dce3c1
--- /dev/null
+++ b/srcpkgs/libpinyin-common
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin-common-devel b/srcpkgs/libpinyin-common-devel
new file mode 120000
index 00000000000..b9910dce3c1
--- /dev/null
+++ b/srcpkgs/libpinyin-common-devel
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin-utils b/srcpkgs/libpinyin-utils
new file mode 120000
index 00000000000..b9910dce3c1
--- /dev/null
+++ b/srcpkgs/libpinyin-utils
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index 7d141b6a086..31811cac10f 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,12 +1,13 @@
 # Template file for 'libpinyin'
 pkgname=libpinyin
 version=2.6.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-libzhuyin"
 hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
 makedepends="db-devel libglib-devel"
-short_desc="Support library for PinYin and ZhuYin (Bopofomo)"
+depends="libpinyin-common>=${version}_${revision}"
+short_desc="Support library for PinYin"
 maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/libpinyin/libpinyin"
@@ -26,13 +27,56 @@ pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
 
-libpinyin-devel_package() {
-	depends="libglib-devel libpinyin-${version}_${revision}"
-	short_desc+=" - development files"
+libpinyin-common_package() {
+	short_desc="Common files for libpinyin and libzhuyin"
 	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.a"
+		vmove usr/lib/libpinyin
+	}
+}
+
+libzhuyin_package() {
+	short_desc="${short_desc/PinYin/ZhuYin}"
+	depends="libpinyin-common>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libzhuyin.so.*"
+	}
+}
+
+libpinyin-utils_package() {
+	short_desc="Support utilities for libpinyin and libzhuyin"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man/man1
+	}
+}
+
+libpinyin-common-devel_package() {
+	short_desc="Common files for libpinyin and libzhuyin"
+	pkg_install() {
+		vmove "usr/include/libpinyin-2.6.0/novel*"
+	}
+}
+
+libpinyin-devel_package() {
+	depends="libglib-devel libpinyin-${version}_${revision}
+	 libpinyin-common-devel-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/include/libpinyin-2.6.0/pinyin*"
+		vmove usr/lib/pkgconfig/libpinyin.pc
+		vmove "usr/lib/libpinyin.so"
+		vmove "usr/lib/libpinyin.a"
+	}
+}
+
+libzhuyin-devel_package() {
+	depends="libglib-devel libzhuyin-${version}_${revision}
+	 libpinyin-devel-${version}_${revision}"
+	short_desc="${short_desc/PinYin/ZhuYin} - development files"
+	pkg_install() {
+		vmove "usr/include/libpinyin-2.6.0/zhuyin*"
+		vmove usr/lib/pkgconfig/libzhuyin.pc
+		vmove usr/lib/libzhuyin.a
+		vmove usr/lib/libzhuyin.so
 	}
 }
diff --git a/srcpkgs/libzhuyin b/srcpkgs/libzhuyin
new file mode 120000
index 00000000000..b9910dce3c1
--- /dev/null
+++ b/srcpkgs/libzhuyin
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libzhuyin-devel b/srcpkgs/libzhuyin-devel
new file mode 120000
index 00000000000..b9910dce3c1
--- /dev/null
+++ b/srcpkgs/libzhuyin-devel
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file