diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt
index 621967776c1..cc87064a167 100644
--- a/core/CHANGELOG.txt
+++ b/core/CHANGELOG.txt
@@ -45,6 +45,7 @@ Drupal 8.0, xxxx-xx-xx (development version)
         path prefix detection is now default.
       * Added HTML 5 language markup; language information added in markup in
         several more places.
+      * Made it possible to assign external language codes to local languages.
     * Simplified and added new features in interface translation:
       * Made interface translation directly accessible from language list.
       * Centralized interface translation import to one directory.
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index ab23be69ac3..af2b3b1a8b7 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -883,7 +883,7 @@ function language_negotiation_configure_browser_form($form, &$form_state) {
   );
   $form['new_mapping']['drupal_langcode'] = array(
     '#type' => 'select',
-    '#title' => t('Drupal langauge'),
+    '#title' => t('Drupal language'),
     '#options' => $language_options,
     '#default_value' => '',
   );
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php
index 76af7307efd..94032efeeca 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php
@@ -84,7 +84,7 @@ class LanguageConfigurationTest extends WebTestBase {
     $this->drupalPost(NULL, $edit, t('Save configuration'));
     $this->assertFieldByXPath('//input[@name="prefix[fr]"]', 'french', 'French path prefix has changed.');
 
-    // Check that prefix of non default langauge cannot be changed to
+    // Check that prefix of non default language cannot be changed to
     // empty string.
     $edit = array(
       'prefix[en]' => '',
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
index 1215cee87c6..f5b279b5540 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
@@ -76,7 +76,7 @@ class LanguageDependencyInjectionTest extends WebTestBase {
     // Initialize the language system.
     drupal_language_initialize();
 
-    // The langauge system creates a Language object which contains the
+    // The language system creates a Language object which contains the
     // same properties as the new default language object.
     $expected = new Language($new_language_default);
     $result = language(LANGUAGE_TYPE_INTERFACE);