diff --git a/content/contribute/themes.md b/content/contribute/themes.md
index e6070c383..256f46093 100644
--- a/content/contribute/themes.md
+++ b/content/contribute/themes.md
@@ -25,7 +25,7 @@ A collection of all themes created by the Hugo community, including screenshots
 ## tl;dr
 
 1. Create your theme using `hugo new theme <THEMENAME>`;
-2. Test your theme against <https://github.com/spf13/HugoBasicExample> \*
+2. Test your theme against <https://github.com/gohugoio/hugoBasicExample> \*
 3. Add a `theme.toml` file to the root of the theme with all required metadata
 4. Add a descriptive `README.md` to the root of the theme source
 5. Add `/images/screenshot.png` and `/images/tn.png`
diff --git a/layouts/shortcodes/gh.html b/layouts/shortcodes/gh.html
index 0d1a9498e..981f4b838 100644
--- a/layouts/shortcodes/gh.html
+++ b/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 }}
\ No newline at end of file
+{{ end }}