diff --git a/core/modules/field/modules/text/text.test b/core/modules/field/modules/text/text.test
index 2d936be..ac4d952 100644
--- a/core/modules/field/modules/text/text.test
+++ b/core/modules/field/modules/text/text.test
@@ -434,7 +434,7 @@ class TextTranslationTestCase extends DrupalWebTestCase {
     $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set "Article" content type to use multilingual support with translation.
-    $edit = array('node_type_language' => TRANSLATION_ENABLED);
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Article')), t('Article content type has been updated.'));
   }
diff --git a/core/modules/locale/locale.content_types.js b/core/modules/locale/locale.content_types.js
new file mode 100644
index 0000000..93f3d9b
--- /dev/null
+++ b/core/modules/locale/locale.content_types.js
@@ -0,0 +1,20 @@
+(function ($) {
+
+Drupal.behaviors.locale = {
+  attach: function (context) {
+    // Provide the vertical tab summaries.
+    $('fieldset#edit-language', context).drupalSetSummary(function(context) {
+      var vals = [];
+
+      vals.push($(".form-item-node-type-language-default select option:selected", context).text());
+
+      $('input:checked', context).next('label').each(function() {
+        vals.push(Drupal.checkPlain($(this).text()));
+      });
+
+      return vals.join(', ');
+    });
+  }
+};
+
+})(jQuery);
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 5c2cdbd..dab9d26 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -291,6 +291,59 @@ function locale_form_alter(&$form, &$form_state, $form_id) {
 }
 
 /**
+ * Implements hook_form_alter().
+ *
+ * Adds language fields to node type forms.
+ */
+function locale_form_node_type_form_alter(&$form, &$form_state) {
+  $type = $form['#node_type']->type;
+  $languages = language_list();
+  $grouped_languages = array();
+  foreach ($languages as $langcode => $language) {
+    $grouped_languages[(int) $language->enabled][$langcode] = $language;
+  }
+
+  $groups = array(t('Disabled'), t('Enabled'));
+  $defaults = array(
+    LANGUAGE_NONE => t('- None -'),
+    'site_default' => t("Site's default"),
+    'current' => t('Current language'),
+    'user_default' => t("User's default"),
+  );
+  $lang_options = array('Special options' => $defaults);
+  foreach (array(1, 0) as $status) {
+    if (isset($grouped_languages[$status])) {
+      $group = $groups[$status];
+      foreach ($grouped_languages[$status] as $langcode => $language) {
+        $lang_options[$group][$langcode] = $language->name;
+      }
+    }
+  }
+
+  $form['additional_settings']['#attached']['js'][] = drupal_get_path('module', 'locale') . '/locale.content_types.js';
+
+  $form['language'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Language settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+    '#group' => 'additional_settings',
+  );
+  $form['language']['node_type_language_default'] = array(
+    '#type' => 'select',
+    '#title' => t('Default language'),
+    '#options' => $lang_options,
+    '#default_value' => variable_get('node_type_language_default_' . $type, LANGUAGE_NONE),
+  );
+  $form['language']['node_type_language_locked'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Lock language'),
+    '#default_value' => variable_get('node_type_language_locked_' . $type, TRUE),
+    '#description' => t('Users will not be able to change the default language on content of this type.'),
+  );
+}
+
+/**
  * Implements hook_form_BASE_FORM_ID_alter().
  */
 function locale_form_node_form_alter(&$form, &$form_state) {
diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index 7d1e55c..3e334d0 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -1272,7 +1272,7 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase {
     $this->assertEqual($GLOBALS['language_interface']->langcode, $this->langcode, t('Current language: %lang', array('%lang' => $GLOBALS['language_interface']->langcode)));
 
     // Enable multilingual workflow option for articles.
-    variable_set('node_type_language_article', 1);
+    variable_set('node_type_language_locked_article', FALSE);
 
     // Change JavaScript translations directory.
     variable_set('locale_js_directory', 'js_translations');
@@ -1987,9 +1987,9 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
 
     // Set "Basic page" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/page');
-    $this->assertText(t('Multilingual support'), t('Multilingual support fieldset present on content type configuration form.'));
+    $this->assertText(t('Language settings'), t('Multilingual support fieldset present on content type configuration form.'));
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
@@ -2059,7 +2059,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
     // Set "Article" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/article');
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Article')), t('Article content type has been updated.'));
@@ -2551,7 +2551,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
 
     // Set "Basic page" content type to use multilingual support.
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
@@ -2665,7 +2665,7 @@ class LocaleCommentLanguageFunctionalTest extends DrupalWebTestCase {
     $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set "Article" content type to use multilingual support.
-    $edit = array('node_type_language' => 1);
+    $edit = array('node_type_language_locked' => FALSE);
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
 
     // Enable content language negotiation UI.
diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc
index b85cb37..1a38341 100644
--- a/core/modules/node/content_types.inc
+++ b/core/modules/node/content_types.inc
@@ -185,14 +185,6 @@ function node_type_form($form, &$form_state, $type = NULL) {
     ),
     '#description' => t('Users with the <em>Administer content</em> permission will be able to override these options.'),
   );
-  if (module_exists('language')) {
-    $form['workflow']['node_type_language'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Multilingual support'),
-      '#default_value' => variable_get('node_type_language_' . $type->type, 0),
-      '#description' => t('Add a language selection field to the editing form, allowing you to select from one of the <a href="!languages">enabled languages</a>. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/config/regional/language'))),
-    );
-  }
   $form['display'] = array(
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index b2616ab..417e82f 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -458,9 +458,12 @@ function node_uninstall() {
         ->condition('name', 'node_options_' . $type)
         ->condition('name', 'node_submitted_' . $type)
         ->condition('name', 'node_permissions_' . $type)
-        ->condition('name', 'node_type_language_' . $type)
+        ->condition('name', 'node_type_language_default_' . $type)
+        ->condition('name', 'node_type_language_locked_' . $type)
       )
       ->execute();
+     // TODO: node_type_language_translation_enabled_ in the translation module
+     // ->condition('name', 'node_type_language_translation_enabled_' . $type)
   }
 
   // Delete node search ranking variables.
@@ -558,6 +561,31 @@ function node_update_8002() {
 }
 
 /**
+ * Rename node type language variable names.
+ *
+ * @see http://drupal.org/node/258785
+ */
+function node_update_8003() {
+  $types = db_query('SELECT type FROM {node_type}')->fetchCol();
+  foreach ($types as $type) {
+    $language = variable_get('node_type_language_' . $type);
+    if (isset($language)) {
+      variable_set('node_type_language_default_' . $type, LANGUAGE_NONE);
+      if ($language) {
+        variable_set('node_type_language_locked_' . $type, TRUE);
+      }
+      else {
+        variable_set('node_type_language_locked_' . $type, FALSE);
+      }
+      if ($language == 2) {
+        variable_set('node_type_language_translation_enabled_' . $type, TRUE);
+      }
+    }
+    variable_del('node_type_language_' . $type);
+  }
+}
+
+/**
  * @} End of "addtogroup updates-7.x-to-8.x"
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 399f543..47ffea1 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -634,6 +634,42 @@ function node_field_extra_fields() {
 }
 
 /**
+ * Get the default language for a node type
+ *
+ * @param string $node_type
+ *   The type of node
+ *
+ * @return (string)
+ *   The language code of the node type's default langcode
+ */
+function node_type_get_default_langcode($node_type) {
+  global $user;
+
+  $default_value = variable_get('node_type_language_default_' . $node_type, LANGUAGE_NONE);
+
+  if ($default_value == LANGUAGE_NONE) {
+    return LANGUAGE_NONE;
+  }
+
+  switch ($default_value) {
+    case 'site-default':
+      $default_value = language_from_default();
+      break;
+
+    case 'current':
+      global $language;
+      $default_value = $language->langcode;
+      break;
+
+    case 'user-default':
+      $default_value = $user->language;
+      break;
+  }
+
+  return $default_value;
+}
+
+/**
  * Deletes a node type from the database.
  *
  * @param $type
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 34a8d4f..8d8d0b1 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -81,7 +81,12 @@ function node_add($type) {
   global $user;
 
   $types = node_type_get_types();
-  $node = (object) array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'langcode' => LANGUAGE_NONE);
+  $node = (object) array(
+    'uid' => $user->uid,
+    'name' => (isset($user->name) ? $user->name : ''),
+    'type' => $type,
+    'langcode' => node_type_get_default_langcode($type)
+  );
   drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
   $output = drupal_get_form($type . '_node_form', $node);
 
@@ -175,7 +180,7 @@ function node_form($form, &$form_state, $node) {
   // @todo D8: Remove. Modules should access the node using $form_state['node'].
   $form['#node'] = $node;
 
-  if (variable_get('node_type_language_' . $node->type, 0) && module_exists('language')) {
+  if (module_exists('language')) {
     $languages = language_list(TRUE);
     $language_options = array();
     foreach ($languages as $langcode => $language) {
@@ -187,6 +192,7 @@ function node_form($form, &$form_state, $node) {
       '#default_value' => (isset($node->langcode) ? $node->langcode : ''),
       '#options' => $language_options,
       '#empty_value' => LANGUAGE_NONE,
+      '#disabled' => variable_get('node_type_language_locked_' . $node->type, TRUE),
     );
   }
   else {
diff --git a/core/modules/path/path.test b/core/modules/path/path.test
index 3679553..e847582 100644
--- a/core/modules/path/path.test
+++ b/core/modules/path/path.test
@@ -277,7 +277,8 @@ class PathLanguageTestCase extends DrupalWebTestCase {
    */
   function testAliasTranslation() {
     // Set 'page' content type to enable translation.
-    variable_set('node_type_language_page', TRANSLATION_ENABLED);
+    variable_set('node_type_language_locked_page', FALSE);
+    variable_set('node_type_language_translation_enabled_page', TRANSLATION_ENABLED);
 
     $english_node = $this->drupalCreateNode(array('type' => 'page'));
     $english_alias = $this->randomName();
diff --git a/core/modules/poll/poll.test b/core/modules/poll/poll.test
index f8ca7fd..1c79f93 100644
--- a/core/modules/poll/poll.test
+++ b/core/modules/poll/poll.test
@@ -844,8 +844,7 @@ class PollTranslateTestCase extends PollTestCase {
 
     // Set "Poll" content type to use multilingual support with translation.
     $this->drupalGet('admin/structure/types/manage/poll');
-    $edit = array();
-    $edit['node_type_language'] = TRANSLATION_ENABLED;
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/poll', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Poll')), t('Poll content type has been updated.'));
 
diff --git a/core/modules/simpletest/tests/upgrade/upgrade.language.test b/core/modules/simpletest/tests/upgrade/upgrade.language.test
index 0dbbf2e..20fa584 100644
--- a/core/modules/simpletest/tests/upgrade/upgrade.language.test
+++ b/core/modules/simpletest/tests/upgrade/upgrade.language.test
@@ -77,7 +77,7 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase {
     $this->drupalGet('node/add/article');
     $this->assertFieldByName('langcode');
     $this->drupalGet('node/add/page');
-    $this->assertNoFieldByName('langcode');
+    $this->assertFieldByName('langcode');
 
     // Check that the user language value was retained in both langcode and
     // preferred_langcode.
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index bb2d7e3..026ecaf 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -111,10 +111,12 @@ function translation_permission() {
  */
 function translation_form_node_type_form_alter(&$form, &$form_state) {
   // Add translation option to content type form.
-  $form['workflow']['node_type_language']['#type'] = 'radios';
-  $form['workflow']['node_type_language']['#options'] = array(t('Disabled'), t('Enabled'), TRANSLATION_ENABLED => t('Enabled, with translation'));
-  // Description based on text from node.module.
-  $form['workflow']['node_type_language']['#description'] = t('Add a language selection field to the editing form, allowing you to select from one of the <a href="@languages">enabled languages</a>. You can also turn on translation for this content type, which lets you have content translated to any of the installed languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('@languages' => url('admin/config/regional/language')));
+  $form['language']['node_type_language_translation_enabled'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable translation'),
+    '#return_value' => TRANSLATION_ENABLED,
+    '#default_value' => variable_get('node_type_language_translation_enabled_' . $form['#node_type']->type, FALSE),
+  );
 }
 
 /**
@@ -476,7 +478,7 @@ function translation_node_get_translations($tnid) {
  *   Boolean value.
  */
 function translation_supported_type($type) {
-  return variable_get('node_type_language_' . $type, 0) == TRANSLATION_ENABLED;
+  return variable_get('node_type_language_translation_enabled_' . $type, 0) == TRANSLATION_ENABLED;
 }
 
 /**
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index 2a77c03..2bcff72 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -37,8 +37,7 @@ class TranslationTestCase extends DrupalWebTestCase {
     // Set "Basic page" content type to use multilingual support with
     // translation.
     $this->drupalGet('admin/structure/types/manage/page');
-    $edit = array();
-    $edit['node_type_language'] = TRANSLATION_ENABLED;
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
 
@@ -230,7 +229,7 @@ class TranslationTestCase extends DrupalWebTestCase {
     // Disable translation support to check that the language switcher is left
     // untouched only for new nodes.
     $this->drupalLogin($this->admin_user);
-    $edit = array('node_type_language' => 0);
+    $edit = array('node_type_language_locked' => TRUE);
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->drupalLogin($this->translator);