###############################################################################
# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#

diff --git a/nls/zh_HK.UTF-8/XI18N_OBJS b/nls/zh_HK.UTF-8/XI18N_OBJS
index e9d5ef8..fff0d41 100644
--- a/nls/zh_HK.UTF-8/XI18N_OBJS
+++ b/nls/zh_HK.UTF-8/XI18N_OBJS
@@ -3,5 +3,9 @@
 #	XI18N objects table for zh_HK.UTF-8 locale
 #
 XLC	common/xlcUTF8Load	_XlcUtf8Loader	# XLC_open
-XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
 XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
+XIM	common/xiiimp		_SwitchOpenIM		# XIM_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XIM	common/xiiimp		_XimpLocalOpenIM	# XIM_open
+XIM	common/ximll		_XimpLocalOpenIM	# XIM_open
+XIM	common/ximlocal		_XimpLocalOpenIM	# XIM_open
diff --git a/nls/zh_HK.UTF-8/XLC_LOCALE.pre b/nls/zh_HK.UTF-8/XLC_LOCALE.pre
index c088032..22b8cf4 100644
--- a/nls/zh_HK.UTF-8/XLC_LOCALE.pre
+++ b/nls/zh_HK.UTF-8/XLC_LOCALE.pre
@@ -37,10 +37,10 @@ fs1    {
 XCOMM   fs2 class
 fs2    {
        charset {
-               name    BIG5HKSCS-0:GLGR
+               name    BIG5-0:GLGR
        }
        font    {
-               primary BIG5HKSCS-0:GLGR
+               primary BIG5-0:GLGR
                substitute BIG5-0:GLGR
        }
 }
@@ -51,6 +51,7 @@ fs3    {
                name    ISO10646-1
        }
        font    {
+		load_option delay_nocheck
                primary ISO10646-1
        }
 }
@@ -83,7 +84,7 @@ XCOMM  cs2 class
 cs2    {
        side            none
        length          2
-       ct_encoding     BIG5HKSCS-0:GLGR
+       ct_encoding     BIG5-0:GLGR
 }
 
 XCOMM  cs3 class