diff --git a/gnome-panel.spec b/gnome-panel.spec
index f58997f..2335260 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -16,12 +16,13 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.8.0.1
-Release: 2
+Release: 3
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source2: redhat-panel-default-setup.entries
 Source3: redhat-panel-default-setup-battstat.entries
 Source4: redhat-panel-backwards-compat-config.schemas
+Source5: add-gimlet-for-cjk.xsl
 License: GPL 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -39,6 +40,7 @@ Prereq: scrollkeeper
 BuildRequires: intltool
 BuildRequires: libpng-devel
 BuildRequires: scrollkeeper
+BuildRequires: libxslt
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel >= %{libglade2_version}
@@ -99,6 +101,10 @@ perl -pi -e 's/PANEL_STOCK_GNOME_LOGO/PANEL_STOCK_MAIN_MENU/g' gnome-panel/menu.
 %configure --disable-gtk-doc --enable-eds
 make
 
+# Add GIMLET to the default panel in CJK
+mv gnome-panel/panel-general.schemas gnome-panel/panel-general.schemas.tmp
+xsltproc --nonet %{SOURCE5} gnome-panel/panel-general.schemas.tmp > gnome-panel/panel-general.schemas
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -142,6 +148,8 @@ for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
+gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --unset /apps/panel/default_setup/general/applet_id_list > /dev/null
+gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --unset /apps/panel/profiles/default/general/applet_id_list > /dev/null
 gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries > /dev/null
 gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
 
@@ -185,7 +193,10 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
-* Fri Oct  1 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-1
+* Thu Oct  7 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-3
+- Add the Input Method Switcher applet in certain locales (#134659)
+
+* Fri Oct  1 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-2
 - New panel layout from Bryan and Seth
 
 * Wed Sep 29 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-1
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index 712051e..336d69b 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -53,31 +53,11 @@
     <entry>
       <key>general/applet_id_list</key>
       <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
-      <value>
-        <list type="string">
-          <value>
-            <string>mixer</string>
-          </value>
-          <value>
-            <string>clock</string>
-          </value>
-          <value>
-            <string>systray</string>
-          </value>
-          <value>
-            <string>battstat_applet</string>
-          </value>
-          <value>
-            <string>show_desktop_button</string>
-          </value>
-          <value>
-            <string>window_list</string>
-          </value>
-          <value>
-            <string>workspace_switcher</string>
-          </value>
-        </list>
-      </value>
+
+      <!-- We pull the value from the schema default so that we can
+           add gimlet in certain locales
+           See add-gimlet-for-cjk.xsl -->
+
     </entry>
 
     <entry><key>general/enable_program_list</key><schema_key>/schemas/apps/panel/general/enable_program_list</schema_key></entry>
@@ -667,6 +647,60 @@
     <entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
+    <!-- GIMLET -->
+
+    <entry>
+      <key>applets/gimlet/object_type</key>
+      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+      <value>
+        <string>bonobo-applet</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/gimlet/toplevel_id</key>
+      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+      <value>
+        <string>top_panel</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/gimlet/position</key>
+      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+      <value>
+        <int>3</int>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/gimlet/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/gimlet/locked</key>
+      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/gimlet/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+      <value>
+        <string>OAFIID:GNOME_imswitcher</string>
+      </value>
+    </entry>
+
+    <entry><key>applets/gimlet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/gimlet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/gimlet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/gimlet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/gimlet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/gimlet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/gimlet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/gimlet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
   <!-- Show Desktop Applet -->
 
     <entry>