diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index fc6beb29..85de6cfe 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -338,8 +338,9 @@ en_US.UTF-8/Compose:		it_IT.UTF-8
 en_US.UTF-8/Compose:		iu_CA.UTF-8
 ja_JP.UTF-8/Compose:		ja_JP.UTF-8
 en_US.UTF-8/Compose:		ka_GE.UTF-8
-en_US.UTF-8/Compose:		kl_GL.UTF-8
 en_US.UTF-8/Compose:		kk_KZ.UTF-8
+en_US.UTF-8/Compose:		kl_GL.UTF-8
+km_KH.UTF-8/Compose:		mk_KH.UTF-8
 en_US.UTF-8/Compose:		kn_IN.UTF-8
 ko_KR.UTF-8/Compose:		ko_KR.UTF-8
 en_US.UTF-8/Compose:		ks_IN.UTF-8
diff --git a/nls/km_KH.UTF-8/Compose.pre b/nls/km_KH.UTF-8/Compose.pre
new file mode 100644
index 00000000..77651d08
--- /dev/null
+++ b/nls/km_KH.UTF-8/Compose.pre
@@ -0,0 +1,8 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
+
+# Khmer digraphs
+<U17ff>	:	"ាំ"
+<U17fe>	:	"ោះ"
+<U17fd>	:	"េះ"
+<U17fc>	:	"ុំ"
+<U17fb>	:	"ុះ"
diff --git a/nls/km_KH.UTF-8/XI18N_OBJS b/nls/km_KH.UTF-8/XI18N_OBJS
new file mode 100644
index 00000000..f201bf43
--- /dev/null
+++ b/nls/km_KH.UTF-8/XI18N_OBJS
@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	        # XLC_open
+XOM	common/xomLTRTTB	_XomGenericOpenOM	# XOM_open
+XIM	common/xiiimp		_SwitchOpenIM		# XIM_open
+XIM	common/xiiimp		_XimpLocalOpenIM	# XIM_open
diff --git a/nls/km_KH.UTF-8/XLC_LOCALE.pre b/nls/km_KH.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 00000000..e69de29b
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 3d11b6ef..6e2384ec 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -723,6 +723,8 @@ kl_GL.iso88591:					kl_GL.ISO8859-1
 kl_GL.ISO-8859-1:				kl_GL.ISO8859-1
 kl_GL.iso885915:				kl_GL.ISO8859-15
 kl_GL.utf8:					kl_GL.UTF-8
+km_KH:						mk_KH.UTF-8
+km_KH.utf8:					mk_KH.UTF-8
 kn:						kn_IN.UTF-8
 kn_IN.utf8:					kn_IN.UTF-8
 ko:						ko_KR.eucKR
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 8acfa36d..40fe1a82 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -379,8 +379,9 @@ en_US.UTF-8/XLC_LOCALE:			it_IT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			iu_CA.UTF-8
 ja_JP.UTF-8/XLC_LOCALE:			ja_JP.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ka_GE.UTF-8
-en_US.UTF-8/XLC_LOCALE:			kl_GL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kk_KZ.UTF-8
+en_US.UTF-8/XLC_LOCALE:			kl_GL.UTF-8
+en_US.UTF-8/XLC_LOCALE:			km_KH.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kn_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:                 ks_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:                 ks_IN@devanagari.UTF-8