diff --git a/docs/config.toml b/docs/config.toml
index 458a06969..c3cf3794b 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -18,7 +18,7 @@ pluralizeListTitles = false
 [[menu.main]]
     name = "Download Hugo"
     pre = "<i class='fa fa-download'></i>"
-    url = "https://github.com/spf13/hugo/releases"
+    url = "https://github.com/gohugoio/hugo/releases"
     weight = -200
 [[menu.main]]
     name = "Site Showcase"
diff --git a/docs/layouts/index.html b/docs/layouts/index.html
index 484c6a1d8..cccc0342d 100644
--- a/docs/layouts/index.html
+++ b/docs/layouts/index.html
@@ -44,7 +44,7 @@
             <a class="btn-info btn btn-lg" href="http://discuss.gohugo.io/">
                 Community <i class="icon-talking"></i>
             </a>
-            <a class="btn-repo btn btn-lg" href="https://github.com/spf13/hugo">
+            <a class="btn-repo btn btn-lg" href="https://github.com/gohugoio/hugo">
                 GitHub <i class="icon-circlestar"></i>
             </a>
         </div>
@@ -200,7 +200,7 @@
                   <i class="lead-icon icon-octocat"></i>
                 <h2>Open and Free</h2>
                 <p class="lead">
-                    Hugo is <a href="https://github.com/spf13/hugo">open source</a> and completely free.
+                    Hugo is <a href="https://github.com/gohugoio/hugo">open source</a> and completely free.
                 </p>
               </div>
             </div>
@@ -227,7 +227,7 @@
                     New to Go? We’ll help you.
                     Not a developer? No problem! Help
                 with <a href="/overview/introduction/">docs,</a> testing
-                and <a href="https://github.com/spf13/hugoThemes/">themes.</a>
+                and <a href="https://github.com/gohugoio/hugoThemes/">themes.</a>
                 </p>
               </div>
             </div>
@@ -245,7 +245,7 @@
             <div class="row">
               <div class="text-center col-md-10 col-md-offset-1">
                 <h1>Getting Started</h1>
-                <a class="btn-primary btn btn-lg" href="https://github.com/spf13/hugo/releases">
+                <a class="btn-primary btn btn-lg" href="https://github.com/gohugoio/hugo/releases">
                     Download
                     <i class="icon-arrow-down"></i>
                 </a>
@@ -272,7 +272,7 @@
               <div class="text-center col-md-6 col-md-offset-3">
                 <ul class="list-inline">
                     <li><a class="icon-twitter icon-2x" href="https://twitter.com/gohugoio"></a></li>
-                    <li><a class="icon-octocat icon-2x" href="https://github.com/spf13/hugo"></a></li>
+                    <li><a class="icon-octocat icon-2x" href="https://github.com/gohugoio/hugo"></a></li>
                 </ul>
                 <hr>
                 <p>Copyright &copy; Steve Francia 2013&ndash;{{ now.Format "2006" }}</p>
diff --git a/docs/layouts/partials/footer.html b/docs/layouts/partials/footer.html
index b422a1ad0..9734aa983 100644
--- a/docs/layouts/partials/footer.html
+++ b/docs/layouts/partials/footer.html
@@ -1,6 +1,6 @@
                     <div class="row">
                         <div class="footer-panel">
-			  <p>Last revision: {{ .Lastmod.Format "January 2, 2006" }}{{ if .IsPage }}{{ with .GitInfo }} | <a href="https://github.com/spf13/hugo/commit/{{ .Hash }}">{{ .Subject }} ({{ .AbbreviatedHash }})</a>{{end }}{{ end }}
+			  <p>Last revision: {{ .Lastmod.Format "January 2, 2006" }}{{ if .IsPage }}{{ with .GitInfo }} | <a href="https://github.com/gohugoio/hugo/commit/{{ .Hash }}">{{ .Subject }} ({{ .AbbreviatedHash }})</a>{{end }}{{ end }}
                           <span style="float: right;">Hugo v{{ .Site.Params.release }} documentation</span>
                         </p>
                         {{ with  getenv "REPOSITORY_URL" -}}
diff --git a/docs/layouts/partials/menu.html b/docs/layouts/partials/menu.html
index 75cba6267..44a8f7731 100644
--- a/docs/layouts/partials/menu.html
+++ b/docs/layouts/partials/menu.html
@@ -29,9 +29,9 @@
               {{end}}
               </li>
           {{end}}
-            <li> <a href="https://github.com/spf13/hugo/issues" target="blank"><i class='fa fa-life-ring'></i> <span>Issues & Help</span></a> </li>
+            <li> <a href="https://github.com/gohugoio/hugo/issues" target="blank"><i class='fa fa-life-ring'></i> <span>Issues & Help</span></a> </li>
             {{ if .IsPage }}
-            {{ $File := .File }}  {{with $File.Path }}<li><a href="https://github.com/spf13/hugo/edit/master/docs/content/{{ $File.Dir }}{{ $File.LogicalName }}" target="blank"><i class='fa fa-edit'></i> Refine this Page</a> </li>{{end}}
+            {{ $File := .File }}  {{with $File.Path }}<li><a href="https://github.com/gohugoio/hugo/edit/master/docs/content/{{ $File.Dir }}{{ $File.LogicalName }}" target="blank"><i class='fa fa-edit'></i> Refine this Page</a> </li>{{end}}
             {{ end }}
         </ul>
         <!-- sidebar menu end-->
diff --git a/docs/layouts/section/showcase.html b/docs/layouts/section/showcase.html
index 6ba46911b..b21e98359 100644
--- a/docs/layouts/section/showcase.html
+++ b/docs/layouts/section/showcase.html
@@ -11,7 +11,7 @@
 <hr>
 
 <blockquote>
-If you want to be added to this page, please send a <a href="https://github.com/spf13/hugo/pulls">pull request</a>. Check out the <a href="{{ relref . "community/contributing.md#showcase-additions" }}">how-to guide</a>.
+If you want to be added to this page, please send a <a href="https://github.com/gohugoio/hugo/pulls">pull request</a>. Check out the <a href="{{ relref . "community/contributing.md#showcase-additions" }}">how-to guide</a>.
 </blockquote>
 
 {{ partial "footer.html" . }}
diff --git a/docs/layouts/shortcodes/gh.html b/docs/layouts/shortcodes/gh.html
index 2ff240a21..0a28bf121 100644
--- a/docs/layouts/shortcodes/gh.html
+++ b/docs/layouts/shortcodes/gh.html
@@ -2,8 +2,8 @@
 {{   if eq (substr . 0 1) "@" }}
 <a href="//github.com/{{ substr . 1 }}">{{ . }}</a>
 {{   else if eq (substr . 0 2) "0x" }}
-<a href="//github.com/spf13/hugo/commit/{{ substr . 2 }}">{{ substr . 2 6 }}</a>
+<a href="//github.com/gohugoio/hugo/commit/{{ substr . 2 }}">{{ substr . 2 6 }}</a>
 {{   else }}
-<a href="//github.com/spf13/hugo/issues/{{ . }}">#{{ . }}</a>
+<a href="//github.com/gohugoio/hugo/issues/{{ . }}">#{{ . }}</a>
 {{   end }}
 {{ end }}