From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue, 13 Jun 2017 16:42:45 +0000 (+0200)
Subject: all: Update import paths to gohugoio/hugo
X-Git-Tag: v0.23~28
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d8717cd4;p=brevno-suite%2Fhugo

all: Update import paths to gohugoio/hugo
---

diff --git a/Makefile b/Makefile
index 64e27ba4..e0dde4e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
 
-PACKAGE = github.com/spf13/hugo
+PACKAGE = github.com/gohugoio/hugo
 COMMIT_HASH = `git rev-parse --short HEAD 2>/dev/null`
 BUILD_DATE = `date +%FT%T%z`
 LDFLAGS = -ldflags "-X ${PACKAGE}/hugolib.CommitHash=${COMMIT_HASH} -X ${PACKAGE}/hugolib.BuildDate=${BUILD_DATE}"
diff --git a/commands/commandeer.go b/commands/commandeer.go
index 7f7e20f7..7de185d2 100644
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -14,9 +14,9 @@
 package commands
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 )
 
 type commandeer struct {
diff --git a/commands/convert.go b/commands/convert.go
index 034d5bf5..15273b0c 100644
--- a/commands/convert.go
+++ b/commands/convert.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
 )
 
 var outputDir string
diff --git a/commands/gendoc.go b/commands/gendoc.go
index 8f241446..70e87dd6 100644
--- a/commands/gendoc.go
+++ b/commands/gendoc.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/commands/gendocshelper.go b/commands/gendocshelper.go
index a5080687..1d83232e 100644
--- a/commands/gendocshelper.go
+++ b/commands/gendocshelper.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/docshelper"
+	"github.com/gohugoio/hugo/docshelper"
 )
 
 type genDocsHelper struct {
diff --git a/commands/genman.go b/commands/genman.go
index cd5c8c84..dd85a6e6 100644
--- a/commands/genman.go
+++ b/commands/genman.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/commands/hugo.go b/commands/hugo.go
index 16170acd..d354b01a 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 
 	"log"
 	"net/http"
@@ -30,9 +30,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/parser"
 	flag "github.com/spf13/pflag"
 
 	"regexp"
@@ -41,12 +41,12 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/fsync"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/livereload"
-	"github.com/spf13/hugo/utils"
-	"github.com/spf13/hugo/watcher"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/livereload"
+	"github.com/gohugoio/hugo/utils"
+	"github.com/gohugoio/hugo/watcher"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/nitro"
 	"github.com/spf13/viper"
diff --git a/commands/import_jekyll.go b/commands/import_jekyll.go
index a7524c1a..37f06bb2 100644
--- a/commands/import_jekyll.go
+++ b/commands/import_jekyll.go
@@ -28,10 +28,10 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/commands/list.go b/commands/list.go
index 97753cc8..4f3319c5 100644
--- a/commands/list.go
+++ b/commands/list.go
@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/hugolib"
+	"github.com/gohugoio/hugo/hugolib"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/commands/new.go b/commands/new.go
index fa996fde..8ff5f1b8 100644
--- a/commands/new.go
+++ b/commands/new.go
@@ -24,11 +24,11 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/create"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/create"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
 )
diff --git a/commands/new_test.go b/commands/new_test.go
index dafe0400..c9adb83d 100644
--- a/commands/new_test.go
+++ b/commands/new_test.go
@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/commands/release.go b/commands/release.go
index 6c14c5d8..c306b2c2 100644
--- a/commands/release.go
+++ b/commands/release.go
@@ -17,7 +17,7 @@ package commands
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/releaser"
+	"github.com/gohugoio/hugo/releaser"
 )
 
 func init() {
diff --git a/commands/server.go b/commands/server.go
index bb0f19cf..0c16b959 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/commands/undraft.go b/commands/undraft.go
index 4f3bcfe2..ae17ab34 100644
--- a/commands/undraft.go
+++ b/commands/undraft.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/parser"
 )
 
 var undraftCmd = &cobra.Command{
diff --git a/commands/undraft_test.go b/commands/undraft_test.go
index d302d31c..7f32c7e2 100644
--- a/commands/undraft_test.go
+++ b/commands/undraft_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/parser"
 )
 
 var (
diff --git a/commands/version.go b/commands/version.go
index 9e673b81..a05967d2 100644
--- a/commands/version.go
+++ b/commands/version.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/kardianos/osext"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugolib"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugolib"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/create/content.go b/create/content.go
index 5cab4289..c51d1f9b 100644
--- a/create/content.go
+++ b/create/content.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/create/content_test.go b/create/content_test.go
index 4ef23020..9728c1c9 100644
--- a/create/content_test.go
+++ b/create/content_test.go
@@ -19,17 +19,17 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 
-	"github.com/spf13/hugo/hugolib"
+	"github.com/gohugoio/hugo/hugolib"
 
 	"fmt"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/create"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/create"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 )
diff --git a/deps/deps.go b/deps/deps.go
index 5f016c4d..b5f935c0 100644
--- a/deps/deps.go
+++ b/deps/deps.go
@@ -5,11 +5,11 @@ import (
 	"log"
 	"os"
 
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
-	"github.com/spf13/hugo/output"
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/output"
+	"github.com/gohugoio/hugo/tpl"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/helpers/content.go b/helpers/content.go
index 167e8de7..afd8c7c3 100644
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -29,8 +29,8 @@ import (
 	"github.com/miekg/mmark"
 	"github.com/mitchellh/mapstructure"
 	"github.com/russross/blackfriday"
-	bp "github.com/spf13/hugo/bufferpool"
-	"github.com/spf13/hugo/config"
+	bp "github.com/gohugoio/hugo/bufferpool"
+	"github.com/gohugoio/hugo/config"
 	jww "github.com/spf13/jwalterweatherman"
 
 	"strings"
diff --git a/helpers/content_renderer.go b/helpers/content_renderer.go
index 6082ae94..49f11bc8 100644
--- a/helpers/content_renderer.go
+++ b/helpers/content_renderer.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/miekg/mmark"
 	"github.com/russross/blackfriday"
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/helpers/emoji_test.go b/helpers/emoji_test.go
index ede601b7..311ff644 100644
--- a/helpers/emoji_test.go
+++ b/helpers/emoji_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/kyokomi/emoji"
-	"github.com/spf13/hugo/bufferpool"
+	"github.com/gohugoio/hugo/bufferpool"
 )
 
 func TestEmojiCustom(t *testing.T) {
diff --git a/helpers/general.go b/helpers/general.go
index 4fd91133..d3dedc77 100644
--- a/helpers/general.go
+++ b/helpers/general.go
@@ -27,7 +27,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/spf13/cast"
-	bp "github.com/spf13/hugo/bufferpool"
+	bp "github.com/gohugoio/hugo/bufferpool"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/pflag"
 )
diff --git a/helpers/language.go b/helpers/language.go
index 9b713685..ba2eeb8f 100644
--- a/helpers/language.go
+++ b/helpers/language.go
@@ -19,7 +19,7 @@ import (
 	"sync"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 )
 
 // These are the settings that should only be looked up in the global Viper
diff --git a/helpers/path_test.go b/helpers/path_test.go
index 25dbdc54..b2e5f65a 100644
--- a/helpers/path_test.go
+++ b/helpers/path_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 )
 
diff --git a/helpers/pathspec.go b/helpers/pathspec.go
index ff448802..bd55d896 100644
--- a/helpers/pathspec.go
+++ b/helpers/pathspec.go
@@ -16,8 +16,8 @@ package helpers
 import (
 	"fmt"
 
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/hugofs"
 )
 
 // PathSpec holds methods that decides how paths in URLs and files in Hugo should look like.
diff --git a/helpers/pathspec_test.go b/helpers/pathspec_test.go
index 2536b8f2..04ec7cac 100644
--- a/helpers/pathspec_test.go
+++ b/helpers/pathspec_test.go
@@ -16,7 +16,7 @@ package helpers
 import (
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
diff --git a/helpers/pygments.go b/helpers/pygments.go
index 05161260..60f62a88 100644
--- a/helpers/pygments.go
+++ b/helpers/pygments.go
@@ -24,8 +24,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/helpers/testhelpers_test.go b/helpers/testhelpers_test.go
index d5a1b60e..86f14114 100644
--- a/helpers/testhelpers_test.go
+++ b/helpers/testhelpers_test.go
@@ -3,7 +3,7 @@ package helpers
 import (
 	"github.com/spf13/viper"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 )
 
 func newTestPathSpec(fs *hugofs.Fs, v *viper.Viper) *PathSpec {
diff --git a/helpers/url_test.go b/helpers/url_test.go
index 49938825..9572547c 100644
--- a/helpers/url_test.go
+++ b/helpers/url_test.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/hugofs/fs.go b/hugofs/fs.go
index f79c927d..92e89d4c 100644
--- a/hugofs/fs.go
+++ b/hugofs/fs.go
@@ -16,7 +16,7 @@ package hugofs
 
 import (
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 )
 
 // Os points to an Os Afero file system.
diff --git a/hugolib/404_test.go b/hugolib/404_test.go
index f921141e..bbaed61d 100644
--- a/hugolib/404_test.go
+++ b/hugolib/404_test.go
@@ -18,7 +18,7 @@ import (
 
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func Test404(t *testing.T) {
diff --git a/hugolib/alias.go b/hugolib/alias.go
index 816ba962..a3fe5c24 100644
--- a/hugolib/alias.go
+++ b/hugolib/alias.go
@@ -22,11 +22,11 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/tpl"
 
 	jww "github.com/spf13/jwalterweatherman"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 const (
diff --git a/hugolib/alias_test.go b/hugolib/alias_test.go
index 68ec8f07..1d6824db 100644
--- a/hugolib/alias_test.go
+++ b/hugolib/alias_test.go
@@ -18,7 +18,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/case_insensitive_test.go b/hugolib/case_insensitive_test.go
index 96953b18..d065a692 100644
--- a/hugolib/case_insensitive_test.go
+++ b/hugolib/case_insensitive_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/config.go b/hugolib/config.go
index e2e9f932..80b7bff3 100644
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -17,7 +17,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/spf13/viper"
 )
 
diff --git a/hugolib/datafiles_test.go b/hugolib/datafiles_test.go
index 5beb5924..b62fb197 100644
--- a/hugolib/datafiles_test.go
+++ b/hugolib/datafiles_test.go
@@ -23,11 +23,11 @@ import (
 	"log"
 	"os"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	jww "github.com/spf13/jwalterweatherman"
 
-	"github.com/spf13/hugo/parser"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/parser"
+	"github.com/gohugoio/hugo/source"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/disableKinds_test.go b/hugolib/disableKinds_test.go
index e833b0a1..81f277c7 100644
--- a/hugolib/disableKinds_test.go
+++ b/hugolib/disableKinds_test.go
@@ -19,10 +19,10 @@ import (
 	"fmt"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/embedded_shortcodes_test.go b/hugolib/embedded_shortcodes_test.go
index 45de0bf0..6f47f98c 100644
--- a/hugolib/embedded_shortcodes_test.go
+++ b/hugolib/embedded_shortcodes_test.go
@@ -22,10 +22,10 @@ import (
 
 	"path/filepath"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/tpl"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/gitinfo.go b/hugolib/gitinfo.go
index f4789320..16d8c43a 100644
--- a/hugolib/gitinfo.go
+++ b/hugolib/gitinfo.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	"github.com/bep/gitmap"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 func (h *HugoSites) assembleGitInfo() {
diff --git a/hugolib/handler_base.go b/hugolib/handler_base.go
index 89aadd11..99c15e15 100644
--- a/hugolib/handler_base.go
+++ b/hugolib/handler_base.go
@@ -14,7 +14,7 @@
 package hugolib
 
 import (
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/source"
 )
 
 type Handler interface {
diff --git a/hugolib/handler_file.go b/hugolib/handler_file.go
index f2166c5e..82ea85fb 100644
--- a/hugolib/handler_file.go
+++ b/hugolib/handler_file.go
@@ -17,7 +17,7 @@ import (
 	"bytes"
 
 	"github.com/dchest/cssmin"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/source"
 )
 
 func init() {
diff --git a/hugolib/handler_meta.go b/hugolib/handler_meta.go
index 0f92f0c6..d2702a39 100644
--- a/hugolib/handler_meta.go
+++ b/hugolib/handler_meta.go
@@ -18,7 +18,7 @@ import (
 
 	"fmt"
 
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/source"
 )
 
 var handlers []Handler
diff --git a/hugolib/handler_page.go b/hugolib/handler_page.go
index 70266fb2..6e230dad 100644
--- a/hugolib/handler_page.go
+++ b/hugolib/handler_page.go
@@ -16,8 +16,8 @@ package hugolib
 import (
 	"fmt"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/source"
 )
 
 func init() {
diff --git a/hugolib/handler_test.go b/hugolib/handler_test.go
index faba04a9..aa58d1c4 100644
--- a/hugolib/handler_test.go
+++ b/hugolib/handler_test.go
@@ -17,8 +17,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 func TestDefaultHandler(t *testing.T) {
diff --git a/hugolib/hugo_info.go b/hugolib/hugo_info.go
index 86842f38..1e0c192e 100644
--- a/hugolib/hugo_info.go
+++ b/hugolib/hugo_info.go
@@ -17,7 +17,7 @@ import (
 	"fmt"
 	"html/template"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 var (
diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index 59cde040..4fe3f877 100644
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -19,12 +19,12 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
 
-	"github.com/spf13/hugo/i18n"
-	"github.com/spf13/hugo/tpl"
-	"github.com/spf13/hugo/tpl/tplimpl"
+	"github.com/gohugoio/hugo/i18n"
+	"github.com/gohugoio/hugo/tpl"
+	"github.com/gohugoio/hugo/tpl/tplimpl"
 )
 
 // HugoSites represents the sites to build. Each site represents a language.
diff --git a/hugolib/hugo_sites_build.go b/hugolib/hugo_sites_build.go
index 61e2ac33..fa0eac70 100644
--- a/hugolib/hugo_sites_build.go
+++ b/hugolib/hugo_sites_build.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // Build builds all sites. If filesystem events are provided,
diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
index e7f93598..06867ab3 100644
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/fortytw2/leaktest"
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/source"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 )
diff --git a/hugolib/menu_old_test.go b/hugolib/menu_old_test.go
index 156a7e55..7c49ed90 100644
--- a/hugolib/menu_old_test.go
+++ b/hugolib/menu_old_test.go
@@ -21,12 +21,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 
 	"path/filepath"
 
 	"github.com/BurntSushi/toml"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/source"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/hugolib/multilingual.go b/hugolib/multilingual.go
index c5943dbd..04efe638 100644
--- a/hugolib/multilingual.go
+++ b/hugolib/multilingual.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 type Multilingual struct {
diff --git a/hugolib/node_as_page_test.go b/hugolib/node_as_page_test.go
index 0e1cc957..f625bf2d 100644
--- a/hugolib/node_as_page_test.go
+++ b/hugolib/node_as_page_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/spf13/afero"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/page.go b/hugolib/page.go
index 909ac247..eaa8aa5d 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -22,9 +22,9 @@ import (
 	"github.com/bep/gitmap"
 
 	"github.com/mitchellh/mapstructure"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/output"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/output"
+	"github.com/gohugoio/hugo/parser"
 
 	"html/template"
 	"io"
@@ -37,8 +37,8 @@ import (
 	"unicode/utf8"
 
 	"github.com/spf13/cast"
-	bp "github.com/spf13/hugo/bufferpool"
-	"github.com/spf13/hugo/source"
+	bp "github.com/gohugoio/hugo/bufferpool"
+	"github.com/gohugoio/hugo/source"
 )
 
 var (
diff --git a/hugolib/page_collections.go b/hugolib/page_collections.go
index 605ec407..e72f9a73 100644
--- a/hugolib/page_collections.go
+++ b/hugolib/page_collections.go
@@ -17,7 +17,7 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/spf13/hugo/cache"
+	"github.com/gohugoio/hugo/cache"
 )
 
 // PageCollections contains the page collections for a site.
diff --git a/hugolib/page_collections_test.go b/hugolib/page_collections_test.go
index f1d6af72..aee99040 100644
--- a/hugolib/page_collections_test.go
+++ b/hugolib/page_collections_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/page_output.go b/hugolib/page_output.go
index ea23dc20..6ea466b4 100644
--- a/hugolib/page_output.go
+++ b/hugolib/page_output.go
@@ -19,10 +19,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/output"
 )
 
 // PageOutput represents one of potentially many output formats of a given
diff --git a/hugolib/page_paths.go b/hugolib/page_paths.go
index 0f5add27..8aa70b95 100644
--- a/hugolib/page_paths.go
+++ b/hugolib/page_paths.go
@@ -20,8 +20,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/output"
 )
 
 // targetPathDescriptor describes how a file path for a given resource
diff --git a/hugolib/page_paths_test.go b/hugolib/page_paths_test.go
index 1d14b92f..9a2db119 100644
--- a/hugolib/page_paths_test.go
+++ b/hugolib/page_paths_test.go
@@ -20,7 +20,7 @@ import (
 
 	"fmt"
 
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/output"
 )
 
 func TestPageTargetPath(t *testing.T) {
diff --git a/hugolib/page_permalink_test.go b/hugolib/page_permalink_test.go
index d46f0d35..6f899efa 100644
--- a/hugolib/page_permalink_test.go
+++ b/hugolib/page_permalink_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestPermalink(t *testing.T) {
diff --git a/hugolib/page_test.go b/hugolib/page_test.go
index 95a3f1ef..dbb7e38e 100644
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -26,8 +26,8 @@ import (
 	"time"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/hugolib/pagination.go b/hugolib/pagination.go
index e9ca6816..4733cf7c 100644
--- a/hugolib/pagination.go
+++ b/hugolib/pagination.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 
 	"github.com/spf13/cast"
 )
diff --git a/hugolib/pagination_test.go b/hugolib/pagination_test.go
index 3307667e..edfac3f3 100644
--- a/hugolib/pagination_test.go
+++ b/hugolib/pagination_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/output"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/robotstxt_test.go b/hugolib/robotstxt_test.go
index b60a2e5f..03332cbc 100644
--- a/hugolib/robotstxt_test.go
+++ b/hugolib/robotstxt_test.go
@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 const robotTxtTemplate = `User-agent: Googlebot
diff --git a/hugolib/rss_test.go b/hugolib/rss_test.go
index cb98f8eb..268b1307 100644
--- a/hugolib/rss_test.go
+++ b/hugolib/rss_test.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestRSSOutput(t *testing.T) {
diff --git a/hugolib/scratch.go b/hugolib/scratch.go
index 4a80416f..ca2c9d6a 100644
--- a/hugolib/scratch.go
+++ b/hugolib/scratch.go
@@ -18,7 +18,7 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/spf13/hugo/tpl/math"
+	"github.com/gohugoio/hugo/tpl/math"
 )
 
 // Scratch is a writable context used for stateful operations in Page/Node rendering.
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index 963ebd0b..150d82c4 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -24,13 +24,13 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/output"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 
-	bp "github.com/spf13/hugo/bufferpool"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/tpl"
+	bp "github.com/gohugoio/hugo/bufferpool"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/tpl"
 )
 
 // ShortcodeWithPage is the "." context in a shortcode template.
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index 2c1e887c..8f2b7117 100644
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -26,14 +26,14 @@ import (
 
 	"github.com/spf13/afero"
 
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/output"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/source"
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/source"
+	"github.com/gohugoio/hugo/tpl"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/site.go b/hugolib/site.go
index a172edd6..47cc74ba 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -28,9 +28,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 
 	"github.com/bep/inflect"
 
@@ -39,14 +39,14 @@ import (
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
-	bp "github.com/spf13/hugo/bufferpool"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/output"
-	"github.com/spf13/hugo/parser"
-	"github.com/spf13/hugo/source"
-	"github.com/spf13/hugo/tpl"
-	"github.com/spf13/hugo/transform"
+	bp "github.com/gohugoio/hugo/bufferpool"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/output"
+	"github.com/gohugoio/hugo/parser"
+	"github.com/gohugoio/hugo/source"
+	"github.com/gohugoio/hugo/tpl"
+	"github.com/gohugoio/hugo/transform"
 	"github.com/spf13/nitro"
 	"github.com/spf13/viper"
 )
diff --git a/hugolib/siteJSONEncode_test.go b/hugolib/siteJSONEncode_test.go
index 4b01a914..9c83899f 100644
--- a/hugolib/siteJSONEncode_test.go
+++ b/hugolib/siteJSONEncode_test.go
@@ -19,7 +19,7 @@ import (
 
 	"path/filepath"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 // Issue #1123
diff --git a/hugolib/site_output.go b/hugolib/site_output.go
index 6b72ea9b..cbd85f35 100644
--- a/hugolib/site_output.go
+++ b/hugolib/site_output.go
@@ -19,9 +19,9 @@ import (
 	"strings"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/output"
 )
 
 func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (map[string]output.Formats, error) {
diff --git a/hugolib/site_output_test.go b/hugolib/site_output_test.go
index 824156e0..6aff8439 100644
--- a/hugolib/site_output_test.go
+++ b/hugolib/site_output_test.go
@@ -24,8 +24,8 @@ import (
 
 	"fmt"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/output"
 	"github.com/spf13/viper"
 )
 
diff --git a/hugolib/site_render.go b/hugolib/site_render.go
index 2e56b9d9..a24946cf 100644
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -18,11 +18,11 @@ import (
 	"path"
 	"sync"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/output"
 
-	bp "github.com/spf13/hugo/bufferpool"
+	bp "github.com/gohugoio/hugo/bufferpool"
 )
 
 // renderPages renders pages each corresponding to a markdown file.
diff --git a/hugolib/site_sections.go b/hugolib/site_sections.go
index 891980be..0e437011 100644
--- a/hugolib/site_sections.go
+++ b/hugolib/site_sections.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	radix "github.com/hashicorp/go-immutable-radix"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // Deprecated: Use .Site.Home.Sections.
diff --git a/hugolib/site_sections_test.go b/hugolib/site_sections_test.go
index 4617c8fb..7479c45f 100644
--- a/hugolib/site_sections_test.go
+++ b/hugolib/site_sections_test.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 2ef7b56d..ff8fdf48 100644
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -22,11 +22,11 @@ import (
 	"github.com/bep/inflect"
 	jww "github.com/spf13/jwalterweatherman"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/source"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/hugolib/site_url_test.go b/hugolib/site_url_test.go
index bb1924a4..272c78c7 100644
--- a/hugolib/site_url_test.go
+++ b/hugolib/site_url_test.go
@@ -19,8 +19,8 @@ import (
 
 	"html/template"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/source"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/hugolib/sitemap_test.go b/hugolib/sitemap_test.go
index a59d0975..002f772d 100644
--- a/hugolib/sitemap_test.go
+++ b/hugolib/sitemap_test.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl"
 )
 
 const sitemapTemplate = `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
index b592d4e6..4f8717d7 100644
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestByCountOrderOfTaxonomies(t *testing.T) {
diff --git a/hugolib/template_engines_test.go b/hugolib/template_engines_test.go
index 1e611272..e2e4ee98 100644
--- a/hugolib/template_engines_test.go
+++ b/hugolib/template_engines_test.go
@@ -20,7 +20,7 @@ import (
 
 	"strings"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestAllTemplateEngines(t *testing.T) {
diff --git a/hugolib/template_test.go b/hugolib/template_test.go
index 43608b7d..a5bec103 100644
--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -18,8 +18,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/hugofs"
 
 	"github.com/spf13/viper"
 )
diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go
index 5b3012a1..6439efb0 100644
--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/deps"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/source"
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/source"
+	"github.com/gohugoio/hugo/tpl"
 	"github.com/spf13/viper"
 
 	"io/ioutil"
@@ -23,7 +23,7 @@ import (
 
 	"log"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/stretchr/testify/require"
 )
diff --git a/i18n/i18n.go b/i18n/i18n.go
index 6b8b92ce..c7f8b582 100644
--- a/i18n/i18n.go
+++ b/i18n/i18n.go
@@ -15,8 +15,8 @@ package i18n
 
 import (
 	"github.com/nicksnyder/go-i18n/i18n/bundle"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/i18n/i18n_test.go b/i18n/i18n_test.go
index 63e09ec8..4793541d 100644
--- a/i18n/i18n_test.go
+++ b/i18n/i18n_test.go
@@ -22,7 +22,7 @@ import (
 	"log"
 
 	"github.com/nicksnyder/go-i18n/i18n/bundle"
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
diff --git a/i18n/translationProvider.go b/i18n/translationProvider.go
index 34558cff..c0d39c4a 100644
--- a/i18n/translationProvider.go
+++ b/i18n/translationProvider.go
@@ -17,8 +17,8 @@ import (
 	"fmt"
 
 	"github.com/nicksnyder/go-i18n/i18n/bundle"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/source"
 )
 
 // TranslationProvider provides translation handling, i.e. loading
diff --git a/main.go b/main.go
index 189cac43..b408196f 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ import (
 
 	"os"
 
-	"github.com/spf13/hugo/commands"
+	"github.com/gohugoio/hugo/commands"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/media/docshelper.go b/media/docshelper.go
index 9a84d5c7..f5afb52f 100644
--- a/media/docshelper.go
+++ b/media/docshelper.go
@@ -1,7 +1,7 @@
 package media
 
 import (
-	"github.com/spf13/hugo/docshelper"
+	"github.com/gohugoio/hugo/docshelper"
 )
 
 // This is is just some helpers used to create some JSON used in the Hugo docs.
diff --git a/output/docshelper.go b/output/docshelper.go
index 7bd03145..1df45726 100644
--- a/output/docshelper.go
+++ b/output/docshelper.go
@@ -5,7 +5,7 @@ import (
 
 	"fmt"
 
-	"github.com/spf13/hugo/docshelper"
+	"github.com/gohugoio/hugo/docshelper"
 )
 
 // This is is just some helpers used to create some JSON used in the Hugo docs.
diff --git a/output/layout_base.go b/output/layout_base.go
index 87674655..fc34b08b 100644
--- a/output/layout_base.go
+++ b/output/layout_base.go
@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 const baseFileBase = "baseof"
diff --git a/output/layout_test.go b/output/layout_test.go
index 6ea5a761..56aac00d 100644
--- a/output/layout_test.go
+++ b/output/layout_test.go
@@ -16,7 +16,7 @@ package output
 import (
 	"testing"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/output/outputFormat.go b/output/outputFormat.go
index 0845b5d3..6e5f4293 100644
--- a/output/outputFormat.go
+++ b/output/outputFormat.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/mitchellh/mapstructure"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 )
 
 // Format represents an output representation, usually to a file on disk.
diff --git a/output/outputFormat_test.go b/output/outputFormat_test.go
index 78b2a609..0540eac0 100644
--- a/output/outputFormat_test.go
+++ b/output/outputFormat_test.go
@@ -17,7 +17,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/releaser/releaser.go b/releaser/releaser.go
index a589718f..17529acf 100644
--- a/releaser/releaser.go
+++ b/releaser/releaser.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 const commitPrefix = "releaser:"
diff --git a/releaser/releaser_test.go b/releaser/releaser_test.go
index 610787b3..c20e17bf 100644
--- a/releaser/releaser_test.go
+++ b/releaser/releaser_test.go
@@ -19,7 +19,7 @@ package releaser
 import (
 	"testing"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/source/content_directory_test.go b/source/content_directory_test.go
index 48c3ae90..4ff12af8 100644
--- a/source/content_directory_test.go
+++ b/source/content_directory_test.go
@@ -16,7 +16,7 @@ package source
 import (
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 )
 
diff --git a/source/file.go b/source/file.go
index 13352429..e2322bc4 100644
--- a/source/file.go
+++ b/source/file.go
@@ -18,10 +18,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 type SourceSpec struct {
diff --git a/source/file_test.go b/source/file_test.go
index d87a154f..a152b4bf 100644
--- a/source/file_test.go
+++ b/source/file_test.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 
 	"github.com/stretchr/testify/assert"
diff --git a/source/filesystem.go b/source/filesystem.go
index ceea96ea..e36b0212 100644
--- a/source/filesystem.go
+++ b/source/filesystem.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 	jww "github.com/spf13/jwalterweatherman"
 	"golang.org/x/text/unicode/norm"
 )
diff --git a/tpl/cast/docshelper.go b/tpl/cast/docshelper.go
index fbbc8c4b..e77c83d2 100644
--- a/tpl/cast/docshelper.go
+++ b/tpl/cast/docshelper.go
@@ -14,9 +14,9 @@
 package cast
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/docshelper"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/docshelper"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 // This file provides documentation support and is randomly put into this package.
diff --git a/tpl/cast/init.go b/tpl/cast/init.go
index 57573e18..d1547310 100644
--- a/tpl/cast/init.go
+++ b/tpl/cast/init.go
@@ -14,8 +14,8 @@
 package cast
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "cast"
diff --git a/tpl/cast/init_test.go b/tpl/cast/init_test.go
index e52ef675..47cbd3d0 100644
--- a/tpl/cast/init_test.go
+++ b/tpl/cast/init_test.go
@@ -16,8 +16,8 @@ package cast
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/collections/apply.go b/tpl/collections/apply.go
index 562d7082..c3c3a297 100644
--- a/tpl/collections/apply.go
+++ b/tpl/collections/apply.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/tpl"
 )
 
 // Apply takes a map, array, or slice and returns a new slice with the function fname applied over it.
diff --git a/tpl/collections/apply_test.go b/tpl/collections/apply_test.go
index ee570993..de24b06c 100644
--- a/tpl/collections/apply_test.go
+++ b/tpl/collections/apply_test.go
@@ -18,8 +18,8 @@ import (
 
 	"fmt"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/collections/collections.go b/tpl/collections/collections.go
index 06ed788c..2a29062d 100644
--- a/tpl/collections/collections.go
+++ b/tpl/collections/collections.go
@@ -24,8 +24,8 @@ import (
 	"time"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // New returns a new instance of the collections-namespaced template functions.
diff --git a/tpl/collections/collections_test.go b/tpl/collections/collections_test.go
index 52b4cdf5..64c358dd 100644
--- a/tpl/collections/collections_test.go
+++ b/tpl/collections/collections_test.go
@@ -25,10 +25,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
diff --git a/tpl/collections/index_test.go b/tpl/collections/index_test.go
index 211a24e1..b9261735 100644
--- a/tpl/collections/index_test.go
+++ b/tpl/collections/index_test.go
@@ -17,7 +17,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/tpl/collections/init.go b/tpl/collections/init.go
index 25ef64e1..4a7c2d87 100644
--- a/tpl/collections/init.go
+++ b/tpl/collections/init.go
@@ -14,8 +14,8 @@
 package collections
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "collections"
diff --git a/tpl/collections/init_test.go b/tpl/collections/init_test.go
index da224967..0739f041 100644
--- a/tpl/collections/init_test.go
+++ b/tpl/collections/init_test.go
@@ -16,8 +16,8 @@ package collections
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/collections/sort.go b/tpl/collections/sort.go
index 79ed3991..36faf207 100644
--- a/tpl/collections/sort.go
+++ b/tpl/collections/sort.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/tpl/compare"
+	"github.com/gohugoio/hugo/tpl/compare"
 )
 
 var comp = compare.New()
diff --git a/tpl/collections/sort_test.go b/tpl/collections/sort_test.go
index 93a4d9da..8db928f2 100644
--- a/tpl/collections/sort_test.go
+++ b/tpl/collections/sort_test.go
@@ -17,7 +17,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestSort(t *testing.T) {
diff --git a/tpl/collections/where_test.go b/tpl/collections/where_test.go
index aee56757..771fafb6 100644
--- a/tpl/collections/where_test.go
+++ b/tpl/collections/where_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestWhere(t *testing.T) {
diff --git a/tpl/compare/init.go b/tpl/compare/init.go
index cc64dcf9..fbc5e1fd 100644
--- a/tpl/compare/init.go
+++ b/tpl/compare/init.go
@@ -14,8 +14,8 @@
 package compare
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "compare"
diff --git a/tpl/compare/init_test.go b/tpl/compare/init_test.go
index 3303e4f2..65e59b1a 100644
--- a/tpl/compare/init_test.go
+++ b/tpl/compare/init_test.go
@@ -16,8 +16,8 @@ package compare
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/crypto/init.go b/tpl/crypto/init.go
index 08421e1b..db6a5f92 100644
--- a/tpl/crypto/init.go
+++ b/tpl/crypto/init.go
@@ -14,8 +14,8 @@
 package crypto
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "crypto"
diff --git a/tpl/crypto/init_test.go b/tpl/crypto/init_test.go
index 755f162d..852a90a4 100644
--- a/tpl/crypto/init_test.go
+++ b/tpl/crypto/init_test.go
@@ -16,8 +16,8 @@ package crypto
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/data/cache.go b/tpl/data/cache.go
index 37990f12..a9b0f013 100644
--- a/tpl/data/cache.go
+++ b/tpl/data/cache.go
@@ -19,8 +19,8 @@ import (
 	"sync"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 var cacheMu sync.RWMutex
diff --git a/tpl/data/data.go b/tpl/data/data.go
index ae0c7c21..0c75fdbb 100644
--- a/tpl/data/data.go
+++ b/tpl/data/data.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/tpl/data/init.go b/tpl/data/init.go
index 5235714e..3bdc0278 100644
--- a/tpl/data/init.go
+++ b/tpl/data/init.go
@@ -14,8 +14,8 @@
 package data
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "data"
diff --git a/tpl/data/init_test.go b/tpl/data/init_test.go
index 66bb0b2b..6bb689a9 100644
--- a/tpl/data/init_test.go
+++ b/tpl/data/init_test.go
@@ -16,8 +16,8 @@ package data
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/data/resources.go b/tpl/data/resources.go
index 4a82ccca..bc9d4b7c 100644
--- a/tpl/data/resources.go
+++ b/tpl/data/resources.go
@@ -22,8 +22,8 @@ import (
 	"time"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
diff --git a/tpl/data/resources_test.go b/tpl/data/resources_test.go
index 42d71918..31e78236 100644
--- a/tpl/data/resources_test.go
+++ b/tpl/data/resources_test.go
@@ -24,10 +24,10 @@ import (
 	"time"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/tpl/encoding/init.go b/tpl/encoding/init.go
index 22f38cb2..bad1804d 100644
--- a/tpl/encoding/init.go
+++ b/tpl/encoding/init.go
@@ -14,8 +14,8 @@
 package encoding
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "encoding"
diff --git a/tpl/encoding/init_test.go b/tpl/encoding/init_test.go
index 7e40a621..6bbee99f 100644
--- a/tpl/encoding/init_test.go
+++ b/tpl/encoding/init_test.go
@@ -16,8 +16,8 @@ package encoding
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/fmt/init.go b/tpl/fmt/init.go
index a9348f8b..a3398b86 100644
--- a/tpl/fmt/init.go
+++ b/tpl/fmt/init.go
@@ -14,8 +14,8 @@
 package fmt
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "fmt"
diff --git a/tpl/fmt/init_test.go b/tpl/fmt/init_test.go
index dbc6e970..01eb2fa6 100644
--- a/tpl/fmt/init_test.go
+++ b/tpl/fmt/init_test.go
@@ -16,8 +16,8 @@ package fmt
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/images/images.go b/tpl/images/images.go
index d08033f2..69bc77a3 100644
--- a/tpl/images/images.go
+++ b/tpl/images/images.go
@@ -24,7 +24,7 @@ import (
 	_ "image/png"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 // New returns a new instance of the images-namespaced template functions.
diff --git a/tpl/images/images_test.go b/tpl/images/images_test.go
index 964d3fb9..6fa93b10 100644
--- a/tpl/images/images_test.go
+++ b/tpl/images/images_test.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/tpl/images/init.go b/tpl/images/init.go
index 4a367b00..299c7684 100644
--- a/tpl/images/init.go
+++ b/tpl/images/init.go
@@ -14,8 +14,8 @@
 package images
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "images"
diff --git a/tpl/images/init_test.go b/tpl/images/init_test.go
index 2525fecb..8a867f9d 100644
--- a/tpl/images/init_test.go
+++ b/tpl/images/init_test.go
@@ -16,8 +16,8 @@ package images
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/inflect/init.go b/tpl/inflect/init.go
index 71884c64..3f258356 100644
--- a/tpl/inflect/init.go
+++ b/tpl/inflect/init.go
@@ -14,8 +14,8 @@
 package inflect
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "inflect"
diff --git a/tpl/inflect/init_test.go b/tpl/inflect/init_test.go
index b24d7af3..cbcd312c 100644
--- a/tpl/inflect/init_test.go
+++ b/tpl/inflect/init_test.go
@@ -16,8 +16,8 @@ package inflect
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/internal/templatefuncsRegistry.go b/tpl/internal/templatefuncsRegistry.go
index 1ecdeca9..85d8c0b3 100644
--- a/tpl/internal/templatefuncsRegistry.go
+++ b/tpl/internal/templatefuncsRegistry.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 var TemplateFuncsNamespaceRegistry []func(d *deps.Deps) *TemplateFuncsNamespace
diff --git a/tpl/lang/init.go b/tpl/lang/init.go
index d0efa699..6a23cdc4 100644
--- a/tpl/lang/init.go
+++ b/tpl/lang/init.go
@@ -14,8 +14,8 @@
 package lang
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "lang"
diff --git a/tpl/lang/init_test.go b/tpl/lang/init_test.go
index a32fa0ae..fc4893ad 100644
--- a/tpl/lang/init_test.go
+++ b/tpl/lang/init_test.go
@@ -16,8 +16,8 @@ package lang
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/lang/lang.go b/tpl/lang/lang.go
index 45a640d7..0442e4de 100644
--- a/tpl/lang/lang.go
+++ b/tpl/lang/lang.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 // New returns a new instance of the lang-namespaced template functions.
diff --git a/tpl/lang/lang_test.go b/tpl/lang/lang_test.go
index 45ed506b..c494fd03 100644
--- a/tpl/lang/lang_test.go
+++ b/tpl/lang/lang_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/tpl/math/init.go b/tpl/math/init.go
index 7b2d319f..3faf0e3a 100644
--- a/tpl/math/init.go
+++ b/tpl/math/init.go
@@ -14,8 +14,8 @@
 package math
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "math"
diff --git a/tpl/math/init_test.go b/tpl/math/init_test.go
index 3204b35e..f1882c1a 100644
--- a/tpl/math/init_test.go
+++ b/tpl/math/init_test.go
@@ -16,8 +16,8 @@ package math
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/os/init.go b/tpl/os/init.go
index e0bcda14..3fc3308f 100644
--- a/tpl/os/init.go
+++ b/tpl/os/init.go
@@ -14,8 +14,8 @@
 package os
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "os"
diff --git a/tpl/os/init_test.go b/tpl/os/init_test.go
index 954e4cde..08d816cd 100644
--- a/tpl/os/init_test.go
+++ b/tpl/os/init_test.go
@@ -16,8 +16,8 @@ package os
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/os/os.go b/tpl/os/os.go
index 03e16e5a..4addae5a 100644
--- a/tpl/os/os.go
+++ b/tpl/os/os.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 // New returns a new instance of the os-namespaced template functions.
diff --git a/tpl/os/os_test.go b/tpl/os/os_test.go
index 166df5e5..772fcb76 100644
--- a/tpl/os/os_test.go
+++ b/tpl/os/os_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/tpl/partials/init.go b/tpl/partials/init.go
index 496deed8..eca93783 100644
--- a/tpl/partials/init.go
+++ b/tpl/partials/init.go
@@ -14,8 +14,8 @@
 package partials
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "partials"
diff --git a/tpl/partials/init_test.go b/tpl/partials/init_test.go
index f26067e3..ef284a82 100644
--- a/tpl/partials/init_test.go
+++ b/tpl/partials/init_test.go
@@ -16,8 +16,8 @@ package partials
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/partials/partials.go b/tpl/partials/partials.go
index fa4fa4e0..d6e9fc9c 100644
--- a/tpl/partials/partials.go
+++ b/tpl/partials/partials.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	texttemplate "text/template"
 
-	bp "github.com/spf13/hugo/bufferpool"
-	"github.com/spf13/hugo/deps"
+	bp "github.com/gohugoio/hugo/bufferpool"
+	"github.com/gohugoio/hugo/deps"
 )
 
 var TestTemplateProvider deps.ResourceProvider
diff --git a/tpl/safe/init.go b/tpl/safe/init.go
index eb3ee624..edb16ed8 100644
--- a/tpl/safe/init.go
+++ b/tpl/safe/init.go
@@ -14,8 +14,8 @@
 package safe
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "safe"
diff --git a/tpl/safe/init_test.go b/tpl/safe/init_test.go
index eee8523d..99305b53 100644
--- a/tpl/safe/init_test.go
+++ b/tpl/safe/init_test.go
@@ -16,8 +16,8 @@ package safe
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/safe/safe.go b/tpl/safe/safe.go
index de2718a9..49db9dd8 100644
--- a/tpl/safe/safe.go
+++ b/tpl/safe/safe.go
@@ -17,7 +17,7 @@ import (
 	"html/template"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // New returns a new instance of the safe-namespaced template functions.
diff --git a/tpl/strings/init.go b/tpl/strings/init.go
index e40fe9d3..45d694b9 100644
--- a/tpl/strings/init.go
+++ b/tpl/strings/init.go
@@ -14,8 +14,8 @@
 package strings
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "strings"
diff --git a/tpl/strings/init_test.go b/tpl/strings/init_test.go
index 22f4ba21..a8ad8ffd 100644
--- a/tpl/strings/init_test.go
+++ b/tpl/strings/init_test.go
@@ -16,8 +16,8 @@ package strings
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/strings/strings.go b/tpl/strings/strings.go
index bba25677..36af1a1c 100644
--- a/tpl/strings/strings.go
+++ b/tpl/strings/strings.go
@@ -21,8 +21,8 @@ import (
 	"unicode/utf8"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // New returns a new instance of the strings-namespaced template functions.
diff --git a/tpl/strings/strings_test.go b/tpl/strings/strings_test.go
index 0c8919be..ee10ac75 100644
--- a/tpl/strings/strings_test.go
+++ b/tpl/strings/strings_test.go
@@ -18,7 +18,7 @@ import (
 	"html/template"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/tpl/template.go b/tpl/template.go
index aa46a8ac..2ee32249 100644
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -21,7 +21,7 @@ import (
 	"html/template"
 	texttemplate "text/template"
 
-	bp "github.com/spf13/hugo/bufferpool"
+	bp "github.com/gohugoio/hugo/bufferpool"
 )
 
 var (
diff --git a/tpl/time/init.go b/tpl/time/init.go
index d0c774a0..db8294a6 100644
--- a/tpl/time/init.go
+++ b/tpl/time/init.go
@@ -14,8 +14,8 @@
 package time
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "time"
diff --git a/tpl/time/init_test.go b/tpl/time/init_test.go
index 4f4ee5de..ed1091b5 100644
--- a/tpl/time/init_test.go
+++ b/tpl/time/init_test.go
@@ -16,8 +16,8 @@ package time
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/tplimpl/template.go b/tpl/tplimpl/template.go
index ae1ae682..d92c4e26 100644
--- a/tpl/tplimpl/template.go
+++ b/tpl/tplimpl/template.go
@@ -24,15 +24,15 @@ import (
 
 	"os"
 
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/output"
 
 	"path/filepath"
 	"sync"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/tpl"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/tpl"
 )
 
 const (
diff --git a/tpl/tplimpl/templateFuncster.go b/tpl/tplimpl/templateFuncster.go
index 656cd89d..e6bbde8e 100644
--- a/tpl/tplimpl/templateFuncster.go
+++ b/tpl/tplimpl/templateFuncster.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	texttemplate "text/template"
 
-	bp "github.com/spf13/hugo/bufferpool"
-	"github.com/spf13/hugo/deps"
+	bp "github.com/gohugoio/hugo/bufferpool"
+	"github.com/gohugoio/hugo/deps"
 )
 
 // Some of the template funcs are'nt entirely stateless.
diff --git a/tpl/tplimpl/templateProvider.go b/tpl/tplimpl/templateProvider.go
index 87cac01e..5d5ee44b 100644
--- a/tpl/tplimpl/templateProvider.go
+++ b/tpl/tplimpl/templateProvider.go
@@ -14,7 +14,7 @@
 package tplimpl
 
 import (
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 type TemplateProvider struct{}
diff --git a/tpl/tplimpl/template_funcs.go b/tpl/tplimpl/template_funcs.go
index 938f4531..309a7b85 100644
--- a/tpl/tplimpl/template_funcs.go
+++ b/tpl/tplimpl/template_funcs.go
@@ -18,27 +18,27 @@ package tplimpl
 import (
 	"html/template"
 
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/tpl/internal"
 
 	// Init the namespaces
-	_ "github.com/spf13/hugo/tpl/cast"
-	_ "github.com/spf13/hugo/tpl/collections"
-	_ "github.com/spf13/hugo/tpl/compare"
-	_ "github.com/spf13/hugo/tpl/crypto"
-	_ "github.com/spf13/hugo/tpl/data"
-	_ "github.com/spf13/hugo/tpl/encoding"
-	_ "github.com/spf13/hugo/tpl/fmt"
-	_ "github.com/spf13/hugo/tpl/images"
-	_ "github.com/spf13/hugo/tpl/inflect"
-	_ "github.com/spf13/hugo/tpl/lang"
-	_ "github.com/spf13/hugo/tpl/math"
-	_ "github.com/spf13/hugo/tpl/os"
-	_ "github.com/spf13/hugo/tpl/partials"
-	_ "github.com/spf13/hugo/tpl/safe"
-	_ "github.com/spf13/hugo/tpl/strings"
-	_ "github.com/spf13/hugo/tpl/time"
-	_ "github.com/spf13/hugo/tpl/transform"
-	_ "github.com/spf13/hugo/tpl/urls"
+	_ "github.com/gohugoio/hugo/tpl/cast"
+	_ "github.com/gohugoio/hugo/tpl/collections"
+	_ "github.com/gohugoio/hugo/tpl/compare"
+	_ "github.com/gohugoio/hugo/tpl/crypto"
+	_ "github.com/gohugoio/hugo/tpl/data"
+	_ "github.com/gohugoio/hugo/tpl/encoding"
+	_ "github.com/gohugoio/hugo/tpl/fmt"
+	_ "github.com/gohugoio/hugo/tpl/images"
+	_ "github.com/gohugoio/hugo/tpl/inflect"
+	_ "github.com/gohugoio/hugo/tpl/lang"
+	_ "github.com/gohugoio/hugo/tpl/math"
+	_ "github.com/gohugoio/hugo/tpl/os"
+	_ "github.com/gohugoio/hugo/tpl/partials"
+	_ "github.com/gohugoio/hugo/tpl/safe"
+	_ "github.com/gohugoio/hugo/tpl/strings"
+	_ "github.com/gohugoio/hugo/tpl/time"
+	_ "github.com/gohugoio/hugo/tpl/transform"
+	_ "github.com/gohugoio/hugo/tpl/urls"
 )
 
 func (t *templateFuncster) initFuncMap() {
diff --git a/tpl/tplimpl/template_funcs_test.go b/tpl/tplimpl/template_funcs_test.go
index 97685f96..038a204e 100644
--- a/tpl/tplimpl/template_funcs_test.go
+++ b/tpl/tplimpl/template_funcs_test.go
@@ -25,13 +25,13 @@ import (
 	"os"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
-	"github.com/spf13/hugo/i18n"
-	"github.com/spf13/hugo/tpl"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/i18n"
+	"github.com/gohugoio/hugo/tpl"
+	"github.com/gohugoio/hugo/tpl/internal"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
diff --git a/tpl/transform/init.go b/tpl/transform/init.go
index 3262cec0..c0e9b2d5 100644
--- a/tpl/transform/init.go
+++ b/tpl/transform/init.go
@@ -14,8 +14,8 @@
 package transform
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "transform"
diff --git a/tpl/transform/init_test.go b/tpl/transform/init_test.go
index a6cb5656..8ac20366 100644
--- a/tpl/transform/init_test.go
+++ b/tpl/transform/init_test.go
@@ -16,8 +16,8 @@ package transform
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/transform/transform.go b/tpl/transform/transform.go
index e44abe6c..2cc4295b 100644
--- a/tpl/transform/transform.go
+++ b/tpl/transform/transform.go
@@ -19,8 +19,8 @@ import (
 	"html/template"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // New returns a new instance of the transform-namespaced template functions.
diff --git a/tpl/transform/transform_test.go b/tpl/transform/transform_test.go
index 45ed5fc1..b50d7530 100644
--- a/tpl/transform/transform_test.go
+++ b/tpl/transform/transform_test.go
@@ -18,10 +18,10 @@ import (
 	"html/template"
 	"testing"
 
-	"github.com/spf13/hugo/config"
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/tpl/urls/init.go b/tpl/urls/init.go
index c0440490..c48fe8ca 100644
--- a/tpl/urls/init.go
+++ b/tpl/urls/init.go
@@ -14,8 +14,8 @@
 package urls
 
 import (
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 )
 
 const name = "urls"
diff --git a/tpl/urls/init_test.go b/tpl/urls/init_test.go
index 5e53f357..6630f13d 100644
--- a/tpl/urls/init_test.go
+++ b/tpl/urls/init_test.go
@@ -16,8 +16,8 @@ package urls
 import (
 	"testing"
 
-	"github.com/spf13/hugo/deps"
-	"github.com/spf13/hugo/tpl/internal"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/tpl/internal"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/tpl/urls/urls.go b/tpl/urls/urls.go
index ee4457e7..60078695 100644
--- a/tpl/urls/urls.go
+++ b/tpl/urls/urls.go
@@ -18,7 +18,7 @@ import (
 	"html/template"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 // New returns a new instance of the urls-namespaced template functions.
diff --git a/transform/chain.go b/transform/chain.go
index 1e550d34..f9c99a04 100644
--- a/transform/chain.go
+++ b/transform/chain.go
@@ -17,7 +17,7 @@ import (
 	"bytes"
 	"io"
 
-	bp "github.com/spf13/hugo/bufferpool"
+	bp "github.com/gohugoio/hugo/bufferpool"
 )
 
 type trans func(rw contentTransformer)
diff --git a/transform/chain_test.go b/transform/chain_test.go
index 5200baa1..7b770ed6 100644
--- a/transform/chain_test.go
+++ b/transform/chain_test.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/transform/hugogeneratorinject.go b/transform/hugogeneratorinject.go
index d80cdaf2..87405308 100644
--- a/transform/hugogeneratorinject.go
+++ b/transform/hugogeneratorinject.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 var metaTagsCheck = regexp.MustCompile(`(?i)<meta\s+name=['|"]?generator['|"]?`)