diff --git a/includes/templates/skin.mustache b/includes/templates/skin.mustache
index 0d7694ca8..7caf07302 100644
--- a/includes/templates/skin.mustache
+++ b/includes/templates/skin.mustache
@@ -51,18 +51,30 @@
 <main id="content" class="mw-body" role="main">
 	<a id="top"></a>
 	<div id="siteNotice" class="mw-body-content">{{{html-site-notice}}}</div>
-	{{>Indicators}}
+
 	{{^is-language-in-header}}
+	{{>Indicators}}
 	<h1 id="firstHeading" class="firstHeading" {{{html-user-language-attributes}}}>{{{html-title}}}</h1>
 	{{/is-language-in-header}}
+
 	{{#is-language-in-header}}
-	<header>
-		<h1 id="firstHeading" class="firstHeading" {{{html-user-language-attributes}}}>{{{html-title}}}</h1>
+	<header class="mw-body-header">
 		{{#data-portlets.data-languages}}{{>Menu}}{{/data-portlets.data-languages}}
+		{{>Indicators}}
+		<h1 id="firstHeading" class="firstHeading" {{{html-user-language-attributes}}}>
+			{{{html-title}}}
+		</h1>
+
+		{{#page-isarticle}}
+			<div id="siteSub" class="noprint">{{msg-tagline}}</div>
+		{{/page-isarticle}}
 	</header>
 	{{/is-language-in-header}}
+
 	<div id="bodyContent" class="mw-body-content">
-		{{#page-isarticle}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/page-isarticle}}
+		{{^is-language-in-header}}
+			{{#page-isarticle}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/page-isarticle}}
+		{{/is-language-in-header}}
 		<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
 		<div id="contentSub2">{{{html-undelete-link}}}</div>
 		{{{html-user-message}}}
diff --git a/resources/skins.vector.styles/layout-default.less b/resources/skins.vector.styles/layout-default.less
index 207de1bf5..474c15725 100644
--- a/resources/skins.vector.styles/layout-default.less
+++ b/resources/skins.vector.styles/layout-default.less
@@ -78,6 +78,14 @@ body {
 	z-index: @z-index-indicators;
 }
 
+.mw-body-header {
+	.mixin-clearfix();
+
+	#p-lang {
+		float: right;
+	}
+}
+
 .mw-body-content {
 	position: relative;
 	z-index: @z-index-base;
@@ -315,19 +323,3 @@ body {
 		}
 	}
 }
-
-main.mw-body {
-	header {
-		border-bottom: 1px solid @border-color-base;
-		.mixin-clearfix();
-
-		h1 {
-			border-bottom: 0;
-			float: left;
-		}
-	}
-
-	#p-lang {
-		float: right;
-	}
-}
diff --git a/skin.json b/skin.json
index 55b079980..4c1140e31 100644
--- a/skin.json
+++ b/skin.json
@@ -236,7 +236,8 @@
 			"value": false
 		},
 		"VectorLanguageInHeader": {
-			"value": false
+			"value": false,
+			"description": "@var boolean Moves the language links from the sidebar into a menu beside the page title. Also moves the indicators to the line below, next to the tagline (siteSub)."
 		},
 		"VectorDisableSidebarPersistence": {
 			"value": false,