diff --git a/_config.yml b/_config.yml
index d8130891..016139c8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -25,6 +25,9 @@ github_username:  json-schema-org
 markdown: kramdown
 #theme: minima
 
+gems:
+  - jekyll-redirect-from
+
 collections:
   docs:
     output: true
diff --git a/calendar b/calendar.json
similarity index 97%
rename from calendar
rename to calendar.json
index b1a6f112..1fa78ffc 100644
--- a/calendar
+++ b/calendar.json
@@ -1,3 +1,6 @@
+---
+redirect_from: "/calendar"
+---
 {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "description": "A representation of an event",
diff --git a/card b/card.json
similarity index 98%
rename from card
rename to card.json
index acdc3d07..773ecef6 100644
--- a/card
+++ b/card.json
@@ -1,3 +1,6 @@
+---
+redirect_from: "/card"
+---
 {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "description": "A representation of a person, company, organization, or place",
diff --git a/documentation.html b/documentation.html
index 9c6e36fe..7deccc79 100644
--- a/documentation.html
+++ b/documentation.html
@@ -49,19 +49,19 @@ <h2>Standard schemas</h2>
     <p>
     <table class="key-value">
         <tr>
-            <td class="key"><a href="http://json-schema.org/geo">Geographic Coordinate</a></td>
+            <td class="key"><a href="http://json-schema.org/geo.json">Geographic Coordinate</a></td>
             <td class="value">a location as longitude and latitude</td>
         </tr>
         <tr>
-            <td class="key"><a href="http://json-schema.org/card">Card</a></td>
+            <td class="key"><a href="http://json-schema.org/card.json">Card</a></td>
             <td class="value">a microformat-style representation of a person, company, organization, or place</td>
         </tr>
         <tr>
-            <td class="key"><a href="http://json-schema.org/calendar">Calendar</a></td>
+            <td class="key"><a href="http://json-schema.org/calendar.json">Calendar</a></td>
             <td class="value">a microformat-style representation of an event</td>
         </tr>
         <tr>
-            <td class="key"><a href="http://json-schema.org/address">Address</a></td>
+            <td class="key"><a href="http://json-schema.org/address.json">Address</a></td>
             <td class="value">a microformat-style representation of a street address</td>
         </tr>
     </table>
diff --git a/geo b/geo.json
similarity index 88%
rename from geo
rename to geo.json
index 2f335265..84db4f54 100644
--- a/geo
+++ b/geo.json
@@ -1,3 +1,6 @@
+---
+redirect_from: "/geo"
+---
 {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "description": "A geographical coordinate",