diff --git a/docs/content/templates/go-templates.md b/docs/content/templates/go-templates.md
index 03783e16e..c9f6178cc 100644
--- a/docs/content/templates/go-templates.md
+++ b/docs/content/templates/go-templates.md
@@ -1,6 +1,7 @@
 ---
 aliases:
 - /layout/go-templates/
+- /layouts/go-templates/
 date: 2013-07-01
 menu:
   main:
diff --git a/docs/content/themes/overview.md b/docs/content/themes/overview.md
index 393213e0f..10ec16c5d 100644
--- a/docs/content/themes/overview.md
+++ b/docs/content/themes/overview.md
@@ -18,7 +18,7 @@ site.
 Hugo themes have been designed to be the perfect balance between
 simplicity and functionality. Hugo themes are powered by the excellent
 go template library. If you are new to go templates, see our [primer on
-go templates](/layouts/go-templates).
+go templates](/templates/go-templates).
 
 Hugo themes support all modern features you come to expect. They are
 structured in such a way to eliminate code duplication. Themes are also