diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 709c1528c4a4580c7f6655a6f14c203ca232d354..4c364df5cb6e8a707fd22d315f8aa70b51a16b76 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -1105,3 +1105,15 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
     }
   }
 }
+
+/*
+ * Implement hook_form_FORM_ID_alter().
+ */
+function locale_form_comment_form_alter(&$form, &$form_state, $form_id) {
+  // If a content type has multilingual support we set the content language as
+  // comment language.
+  if (empty($form['language']['#value']) && locale_multilingual_node_type($form['#node']->type)) {
+    global $language;
+    $form['language']['#value'] = $language->language;
+  }
+}