diff --git a/_config.yml b/_config.yml
index fafb96603..5f8a89165 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,6 +20,8 @@ plugins:
   - jekyll-sitemap
 
 # Custom vars
+title:            Bootstrap
+description:      "The world's most popular mobile-first and responsive front-end framework."
 current_version:  3.4.1
 docs_version:     3.4
 repo:             https://github.com/twbs/bootstrap
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 8b0e175d1..6afac5292 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -5,13 +5,15 @@
 <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
 
 <title>
-  {% if page.layout == "home" %}
-    {{ page.title }}
-  {% else %}
-    {{ page.title }} &middot; Bootstrap
-  {% endif %}
+  {%- if page.title -%}
+    {{ page.title | smartify }} · {{ site.title | smartify }}
+  {%- else -%}
+    {{ site.title | smartify }} · {{ site.description | smartify }}
+  {%- endif -%}
 </title>
 
+<link rel="canonical" href="{{ site.url | append: site.baseurl | append: page.url }}">
+
 <!-- Bootstrap core CSS -->
 {% if site.github %}
   <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">