###############################################################################
# Copyright (c) 2009, 2011, 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/iso8859-6/XI18N_OBJS b/nls/iso8859-6/XI18N_OBJS
index ab2d300..82adf9b 100644
--- a/nls/iso8859-6/XI18N_OBJS
+++ b/nls/iso8859-6/XI18N_OBJS
@@ -3,5 +3,6 @@
 #	XI18N objects table for iso8859-6 locale
 #
 XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
-XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XIM     common/ximlocal _XimpLocalOpenIM        # XIM_open
+#XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
 XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/nls/iso8859-6/XLC_LOCALE.pre b/nls/iso8859-6/XLC_LOCALE.pre
index 5b0d4d4..fd3fe6d 100644
--- a/nls/iso8859-6/XLC_LOCALE.pre
+++ b/nls/iso8859-6/XLC_LOCALE.pre
@@ -11,8 +11,7 @@ fs0	{
 		name		ISO8859-1:GL
 	}
 	font	{
-		primary		ISO8859-6:GL
-		substitute	ISO8859-1:GL
+		primary		ISO8859-1:GL
 		vertical_rotate	all
 	}
 }
@@ -21,8 +20,9 @@ fs1	{
 	charset	{
 		name		ISO8859-6:GR
 	}
+	char_len        1
 	font	{
-		primary		ISO8859-6:GR
+		primary		ISO8859-6:GRGL
 	}
 }
 END XLC_FONTSET