diff --git a/postprocess/Package_registry.mk b/postprocess/Package_registry.mk
index 9bab645fe0fe..2332e1bfe3ad 100644
--- a/postprocess/Package_registry.mk
+++ b/postprocess/Package_registry.mk
@@ -16,6 +16,18 @@ $(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/reg
 	) \
 ))
 
+$(eval $(foreach lang,$(gb_CJK_LANGS),\
+	$(call gb_Package_add_file,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry/cjk_$(lang).xcd,cjk.xcd) \
+))
+
+$(eval $(foreach lang,$(gb_CTL_LANGS),\
+	$(call gb_Package_add_file,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry/ctl_$(lang).xcd,ctl.xcd) \
+))
+
+$(eval $(foreach lang,$(gb_CTLSEQCHECK_LANGS),\
+	$(call gb_Package_add_file,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry/ctlseqcheck_$(lang).xcd,ctlseqcheck.xcd) \
+))
+
 $(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry/res,\
 	$(foreach lang,$(gb_Configuration_LANGS), \
 		fcfg_langpack_$(lang).xcd \
diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk b/solenv/gbuild/extensions/pre_SharedLangList.mk
index 16ab3fc1c600..4d32a3ed14e3 100644
--- a/solenv/gbuild/extensions/pre_SharedLangList.mk
+++ b/solenv/gbuild/extensions/pre_SharedLangList.mk
@@ -44,4 +44,10 @@ gb_HELP_LANGS += \
 				$(wildcard $(SRCDIR)/translations/source/$(lang)/helpcontent2)),\
 			$(lang)))
 
+# Langs that need special handling for registry files. This is done by
+# MAKE_LANG_SPECIFIC flag in scp.
+gb_CJK_LANGS := $(filter $(gb_WITH_LANG),ja ko zh-CN zh-TW)
+gb_CTL_LANGS := $(filter $(gb_WITH_LANG),ar bo dz fa gu he hi km ky-CN lo my ne or pa-IN ta th)
+gb_CTLSEQCHECK_LANGS := $(filter $(gb_CTL_LANGS),km lo th)
+
 # vim: set noet ts=4 sw=4: