diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9c942df..c4ba5ea 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Apache Solr Multilingual 6.x-2.0-beta2, 2011-xx-xx
+--------------------------------------------------
+[#1288144] mkalkbrenner: CCK Multilanguage values - added tm_LANGUAGE_* to schema.xml
+
 
 Apache Solr Multilingual 6.x-2.0-beta1, 2011-06-29
 --------------------------------------------------
diff --git a/apachesolr_multilingual.schema_generator.inc b/apachesolr_multilingual.schema_generator.inc
index 0f88242..e673dd5 100644
--- a/apachesolr_multilingual.schema_generator.inc
+++ b/apachesolr_multilingual.schema_generator.inc
@@ -269,6 +269,7 @@ function apachesolr_multilingual_schema_generator_form_do_validate(&$form, &$for
     $blocks['<!-- field_tags_a_LANGUAGE -->'] = '<field name="tags_a[LANGUAGE_ID]" type="text[LANGUAGE_ID]" indexed="true" stored="false" omitNorms="true"/>';
     $blocks['<!-- field_tags_inline_LANGUAGE -->'] = '<field name="tags_inline[LANGUAGE_ID]" type="text[LANGUAGE_ID]" indexed="true" stored="false" omitNorms="true"/>';
     $blocks['<!-- fieldType_textSpell_multilingual_StopFilter -->'] = '<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_spell[LANGUAGE_ID].txt"/>';
+    $blocks['<!-- dynamicField_tm_LANGUAGE_* -->'] = '<dynamicField name="tm[LANGUAGE_ID]_*" type="text[LANGUAGE_ID]" indexed="true" stored="true" multiValued="true" termVectors="true"/>';
     $blocks['<!-- dynamicField_ts_LANGUAGE_* -->'] = '<dynamicField name="ts[LANGUAGE_ID]_*" type="text[LANGUAGE_ID]" indexed="true" stored="true" multiValued="false" termVectors="true"/>';
 
     // solrconfig.xml gettablefiles
diff --git a/resources/schema.xml b/resources/schema.xml
index b1ca744..d952fbb 100755
--- a/resources/schema.xml
+++ b/resources/schema.xml
@@ -401,6 +401,7 @@
    <dynamicField name="sim_*" type="sint"    indexed="true"  stored="true" multiValued="true"/>
    <dynamicField name="sm_*"  type="string"    indexed="true"  stored="true" multiValued="true"/>
    <dynamicField name="tm_*"  type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true"/>
+   <!-- dynamicField_tm_LANGUAGE_* -->
    <dynamicField name="ss_*"  type="string"    indexed="true"  stored="true" multiValued="false"/>
    <dynamicField name="ts_*"  type="text"    indexed="true"  stored="true" multiValued="false" termVectors="true"/>
    <!-- dynamicField_ts_LANGUAGE_* -->