diff --git a/.cvsignore b/.cvsignore
index 13392b4..8eeeb6f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 gedit-0.9.4.tar.gz
+gedit-po.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index 8123155..d19be9e 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,7 +1,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version:	0.9.4
-Release:	6
+Release:	7c
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -17,6 +17,10 @@ BuildRequires:  libglade-devel gtk+-devel gnome-print-devel gdk-pixbuf-devel
 
 Patch1:		gedit-0.9.4-cjk.patch
 Patch2:		gedit-0.9.4-print.patch
+Patch3:		gedit-0.9.4-gb18030.patch
+Patch4:		gedit-0.9.4-gb18030fontset.patch
+
+Source2:	gedit-po.tar.bz2
 
 %description
 gEdit is a small but powerful text editor designed specifically for
@@ -41,9 +45,14 @@ Install gedit-devel if you want to write plug-ins for gEdit.
 %setup -q
 %patch1 -p1 -b .cjk
 %patch2 -p1 -b .print
+%patch3 -p1 -b .gb18030
+%patch4 -p1 -b .gb18030fontset
+
+(cd $RPM_BUILD_DIR/%{name}-%{version}/po && tar xvfj %{SOURCE2})
 
 %build
 
+autoconf
 %configure
 make
 
@@ -71,6 +80,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Thu Nov 29 2001 Leon Ho <llch@redhat.com>
+- add gb18030 fontset
+- fix fontset for CJK
+- fix font name for zh_CN printing
+
+* Thu Nov 29 2001 Akira TAGOH <tagoh@redhat.com> 0.9.4-6c
+- Fixed a font name for printing.
+
 * Thu Jul 19 2001 Havoc Pennington <hp@redhat.com>
 - add some more build requires
 
diff --git a/sources b/sources
index 8437c7b..9b95038 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 6e7eb64c6263422c5dafaeefaf43b38c  gedit-0.9.4.tar.gz
+cfd5de10bbd37cc287efe167196a17fe  gedit-po.tar.bz2