diff --git a/Build2015.htm b/Build2015.htm
index 50870c976..806c6296e 100644
--- a/Build2015.htm
+++ b/Build2015.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="Build2015.htm" %}
+{% include redirect.html %}
diff --git a/Community.htm b/Community.htm
index 6a00c3c5d..70e9a53a5 100644
--- a/Community.htm
+++ b/Community.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="Community.htm" %}
+{% include redirect.html %}
diff --git a/Downloads.htm b/Downloads.htm
index 3e23f0bae..ea4615c83 100644
--- a/Downloads.htm
+++ b/Downloads.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="Downloads.htm" %}
+{% include redirect.html %}
diff --git a/GetStarted.htm b/GetStarted.htm
index 623bf39c0..05f6f8865 100644
--- a/GetStarted.htm
+++ b/GetStarted.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="GetStarted.htm" %}
+{% include redirect.html %}
diff --git a/_includes/redirect.html b/_includes/redirect.html
index 7129692e3..ea34df601 100644
--- a/_includes/redirect.html
+++ b/_includes/redirect.html
@@ -1,15 +1,15 @@
 
 {% if include.url %}
 
-{% capture url %}
-{{include.url}}
-{% endcapture %}
+    {% capture url %}
+    {{include.url}}
+    {% endcapture %}
 
 {% else %}
 
-{% capture url %}
-{{include.base}}/{{include.lang}}/{{include.page}}
-{% endcapture %}
+    {% capture url %}
+    {{site.baseurl}}/{{page.lang}}{{page.url}}
+    {% endcapture %}
 
 {% endif %}
 
diff --git a/win10/SetupMBM.htm b/win10/SetupMBM.htm
index 2dd1a8930..c56235473 100644
--- a/win10/SetupMBM.htm
+++ b/win10/SetupMBM.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="win10/SetupMBM.htm" %}
+{% include redirect.html %}
diff --git a/win10/StartCoding.htm b/win10/StartCoding.htm
index fa855ff88..0f4548660 100644
--- a/win10/StartCoding.htm
+++ b/win10/StartCoding.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="win10/StartCoding.htm" %}
+{% include redirect.html %}
diff --git a/win10/samples/HelloWorld.htm b/win10/samples/HelloWorld.htm
index f3b007fda..573d4387d 100644
--- a/win10/samples/HelloWorld.htm
+++ b/win10/samples/HelloWorld.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="win10/samples/HelloWorld.htm" %}
+{% include redirect.html %}
diff --git a/win10/tools/CommandLineUtils.htm b/win10/tools/CommandLineUtils.htm
index af386e78f..78d176201 100644
--- a/win10/tools/CommandLineUtils.htm
+++ b/win10/tools/CommandLineUtils.htm
@@ -5,4 +5,4 @@
 lang: en-US
 ---
 
-{% include redirect.html base=site.baseurl lang=page.lang page="win10/tools/CommandLineUtils.htm" %}
+{% include redirect.html %}