diff --git a/docs/_config.yml b/docs/_config.yml
index bec8b14f..80e58d30 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -18,6 +18,7 @@ collections:
     permalink: "/news/:year/:month/:day/:title/"
     output: true
   tutorials:
+    permalink: "/:collection/:path/"
     output: true
 defaults:
 - scope:
@@ -30,6 +31,11 @@ defaults:
     type: posts
   values:
     layout: news_item
+- scope:
+    path: _tutorials
+    type: tutorials
+  values:
+    layout: tutorials
 - scope:
     path: ''
   values:
diff --git a/docs/_tutorials/cache_api.md b/docs/_tutorials/cache-api.md
similarity index 98%
rename from docs/_tutorials/cache_api.md
rename to docs/_tutorials/cache-api.md
index 84a7d047..491572df 100644
--- a/docs/_tutorials/cache_api.md
+++ b/docs/_tutorials/cache-api.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/cache-api/
 title: Cache API
 ---
 
diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-site-to-jekyll.md
similarity index 99%
rename from docs/_tutorials/convert-existing-site-to-jekyll.md
rename to docs/_tutorials/convert-site-to-jekyll.md
index 65000674..f90b3bdf 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-site-to-jekyll.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/convert-site-to-jekyll/
 title: Convert an HTML site to Jekyll
 ---
 
diff --git a/docs/_tutorials/custom-404-page.md b/docs/_tutorials/custom-404-page.md
index d739735d..29e93420 100644
--- a/docs/_tutorials/custom-404-page.md
+++ b/docs/_tutorials/custom-404-page.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/custom-404-page/
 title: Custom 404 Page
 ---
 
diff --git a/docs/_tutorials/index.md b/docs/_tutorials/index.md
index 4deb89bc..8f5e8211 100644
--- a/docs/_tutorials/index.md
+++ b/docs/_tutorials/index.md
@@ -1,5 +1,4 @@
 ---
-layout: tutorials
 title: Tutorials
 permalink: /tutorials/home/
 redirect_from: /tutorials/index.html
diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index c1c86a25..2ba30ab0 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/navigation/
 title: Navigation
 ---
 
diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
index e5aa4ea6..d938564e 100644
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/orderofinterpretation/
 title: Order of interpretation
 ---
 
diff --git a/docs/_tutorials/using-jekyll-with-bundler.md b/docs/_tutorials/using-jekyll-with-bundler.md
index 73e77679..bfc6c6a7 100644
--- a/docs/_tutorials/using-jekyll-with-bundler.md
+++ b/docs/_tutorials/using-jekyll-with-bundler.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/using-jekyll-with-bundler/
 title: Using Jekyll with Bundler
 ---
 
diff --git a/docs/_tutorials/video-walkthroughs.md b/docs/_tutorials/video-walkthroughs.md
index 635b883f..55cfe99f 100644
--- a/docs/_tutorials/video-walkthroughs.md
+++ b/docs/_tutorials/video-walkthroughs.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/video-walkthroughs/
 title: Video Walkthroughs
 ---