diff --git a/glibc.spec b/glibc.spec
index 03b1f6d..a501440 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcrelease 15c
+%define glibcrelease 16c
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 Summary: The GNU libc libraries.
 Name: glibc
@@ -37,7 +37,7 @@ BuildPreReq: gcc >= 2.96-82
 %endif
 Conflicts: rpm <= 4.0-0.65
 Conflicts: glibc-devel < 2.2.3
-Patch0: glibc-kernel-2.4.patch
+Patch: glibc-kernel-2.4.patch
 Patch1: glibc-2.2.4-gb18030.patch
 Patch2: glibc-2.2.4-sc.patch
 %ifarch ia64 sparc64 s390x
@@ -134,7 +134,6 @@ performance with NIS+ and may help with DNS as well.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 # If we are building enablekernel 2.x.y glibc on older kernel,
@@ -142,6 +141,7 @@ performance with NIS+ and may help with DNS as well.
 # are ever run
 case `uname -r` in
 %enablemask)
+%patch -p1
 ;; esac
 
 %ifarch armv4l sparc64 ia64 s390 s390x
@@ -397,6 +397,22 @@ gzip -9 documentation/ChangeLog*
 
 %postun -p /sbin/ldconfig
 
+%post common
+# Create symlink to share GB2312 and GB18030 LC_MESSAGES
+if [ ! -d /usr/share/locale ]; then
+  mkdir -p /usr/share/locale
+fi
+
+if [ -d /usr/share/locale/zh_CN.GB18030/LC_MESSAGES ] && [ ! -h /usr/share/locale/zh_CN.GB18030 ]; then
+  cp /usr/share/locale/zh_CN.GB18030/LC_MESSAGES/* /usr/share/locale/zh_CN.GB2312/LC_MESSAGES/
+fi
+
+rm -rf /usr/share/locale/zh_CN.GB18030 2> /dev/null
+
+if [ ! -h /usr/share/locale/zh_CN.GB18030 ] || [ ! -d /usr/share/locale/zh_CN.GB18030 ]; then 
+  ln -s /usr/share/locale/zh_CN.GB2312 /usr/share/locale/zh_CN.GB18030
+fi
+
 %post devel
 /sbin/install-info %{_infodir}/libc.info.gz %{_infodir}/dir
 
@@ -467,11 +483,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Sat Nov 10 2001 Yu Shao <yshao@redhat.com> 2.2.4-15c
-- add llch@redhat.com's glibc-2.2.4-sc.patch
-
-* Sat Nov 10 2001 Yu Shao <yshao@redhat.com> 2.2.4-14c
-- gb18030 fix
+* Fri Nov 30 2001 Leon Ho <llch@redhat.com> 2.2.4-16c
+- Add symlink to /usr/share/locale/GB18030
+- reapply yshao@redhat.com's glibc-2.2.4-gb18030.patch
+- reapply llch@redhat.com's glibc-2.2.4-sc.patch
 
 * Mon Sep  3 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-13
 - fix iconvconfig