shithub: hugo

Download patch

ref: d8717cd4c74e80ea8e20adead9321412a2d76022
parent: 2d08a296a2de3b3db209a0f44249b7b24733098e
author: Bjørn Erik Pedersen <[email protected]>
date: Tue Jun 13 14:42:45 EDT 2017

all: Update import paths to gohugoio/hugo

--- 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}"
--- 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 {
--- a/commands/convert.go
+++ b/commands/convert.go
@@ -21,8 +21,8 @@
 
 	"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
--- a/commands/gendoc.go
+++ b/commands/gendoc.go
@@ -22,8 +22,8 @@
 
 	"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"
 )
 
--- a/commands/gendocshelper.go
+++ b/commands/gendocshelper.go
@@ -20,7 +20,7 @@
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/docshelper"
+	"github.com/gohugoio/hugo/docshelper"
 )
 
 type genDocsHelper struct {
--- a/commands/genman.go
+++ b/commands/genman.go
@@ -19,8 +19,8 @@
 
 	"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"
 )
 
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -19,7 +19,7 @@
 	"fmt"
 	"io/ioutil"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 
 	"log"
 	"net/http"
@@ -30,9 +30,9 @@
 	"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 @@
 	"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"
--- a/commands/import_jekyll.go
+++ b/commands/import_jekyll.go
@@ -28,10 +28,10 @@
 	"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"
 )
 
--- a/commands/list.go
+++ b/commands/list.go
@@ -17,7 +17,7 @@
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/hugolib"
+	"github.com/gohugoio/hugo/hugolib"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
--- a/commands/new.go
+++ b/commands/new.go
@@ -24,11 +24,11 @@
 
 	"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"
 )
--- a/commands/new_test.go
+++ b/commands/new_test.go
@@ -17,7 +17,7 @@
 	"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"
--- a/commands/release.go
+++ b/commands/release.go
@@ -17,7 +17,7 @@
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/releaser"
+	"github.com/gohugoio/hugo/releaser"
 )
 
 func init() {
--- a/commands/server.go
+++ b/commands/server.go
@@ -26,8 +26,8 @@
 
 	"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"
 )
 
--- a/commands/undraft.go
+++ b/commands/undraft.go
@@ -20,7 +20,7 @@
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/parser"
 )
 
 var undraftCmd = &cobra.Command{
--- a/commands/undraft_test.go
+++ b/commands/undraft_test.go
@@ -21,7 +21,7 @@
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/parser"
+	"github.com/gohugoio/hugo/parser"
 )
 
 var (
--- a/commands/version.go
+++ b/commands/version.go
@@ -22,8 +22,8 @@
 
 	"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"
 )
 
--- a/create/content.go
+++ b/create/content.go
@@ -24,9 +24,9 @@
 
 	"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"
 )
 
--- a/create/content_test.go
+++ b/create/content_test.go
@@ -19,17 +19,17 @@
 	"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"
 )
--- a/deps/deps.go
+++ b/deps/deps.go
@@ -5,11 +5,11 @@
 	"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"
 )
 
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -29,8 +29,8 @@
 	"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"
--- a/helpers/content_renderer.go
+++ b/helpers/content_renderer.go
@@ -19,7 +19,7 @@
 
 	"github.com/miekg/mmark"
 	"github.com/russross/blackfriday"
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
--- a/helpers/emoji_test.go
+++ b/helpers/emoji_test.go
@@ -19,7 +19,7 @@
 	"testing"
 
 	"github.com/kyokomi/emoji"
-	"github.com/spf13/hugo/bufferpool"
+	"github.com/gohugoio/hugo/bufferpool"
 )
 
 func TestEmojiCustom(t *testing.T) {
--- a/helpers/general.go
+++ b/helpers/general.go
@@ -27,7 +27,7 @@
 	"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"
 )
--- a/helpers/language.go
+++ b/helpers/language.go
@@ -19,7 +19,7 @@
 	"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
--- a/helpers/path_test.go
+++ b/helpers/path_test.go
@@ -30,7 +30,7 @@
 	"github.com/stretchr/testify/assert"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 )
 
--- a/helpers/pathspec.go
+++ b/helpers/pathspec.go
@@ -16,8 +16,8 @@
 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.
--- a/helpers/pathspec_test.go
+++ b/helpers/pathspec_test.go
@@ -16,7 +16,7 @@
 import (
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
--- a/helpers/pygments.go
+++ b/helpers/pygments.go
@@ -24,8 +24,8 @@
 	"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"
 )
 
--- a/helpers/testhelpers_test.go
+++ b/helpers/testhelpers_test.go
@@ -3,7 +3,7 @@
 import (
 	"github.com/spf13/viper"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 )
 
 func newTestPathSpec(fs *hugofs.Fs, v *viper.Viper) *PathSpec {
--- a/helpers/url_test.go
+++ b/helpers/url_test.go
@@ -18,7 +18,7 @@
 	"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"
--- a/hugofs/fs.go
+++ b/hugofs/fs.go
@@ -16,7 +16,7 @@
 
 import (
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 )
 
 // Os points to an Os Afero file system.
--- a/hugolib/404_test.go
+++ b/hugolib/404_test.go
@@ -18,7 +18,7 @@
 
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func Test404(t *testing.T) {
--- a/hugolib/alias.go
+++ b/hugolib/alias.go
@@ -22,11 +22,11 @@
 	"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 (
--- a/hugolib/alias_test.go
+++ b/hugolib/alias_test.go
@@ -18,7 +18,7 @@
 	"runtime"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/require"
 )
 
--- a/hugolib/case_insensitive_test.go
+++ b/hugolib/case_insensitive_test.go
@@ -20,8 +20,8 @@
 	"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"
 )
 
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -17,7 +17,7 @@
 	"fmt"
 
 	"github.com/spf13/afero"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/spf13/viper"
 )
 
--- a/hugolib/datafiles_test.go
+++ b/hugolib/datafiles_test.go
@@ -23,11 +23,11 @@
 	"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"
 )
 
--- a/hugolib/disableKinds_test.go
+++ b/hugolib/disableKinds_test.go
@@ -19,10 +19,10 @@
 	"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"
 )
 
--- a/hugolib/embedded_shortcodes_test.go
+++ b/hugolib/embedded_shortcodes_test.go
@@ -22,10 +22,10 @@
 
 	"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"
 )
 
--- a/hugolib/gitinfo.go
+++ b/hugolib/gitinfo.go
@@ -19,7 +19,7 @@
 	"strings"
 
 	"github.com/bep/gitmap"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 func (h *HugoSites) assembleGitInfo() {
--- 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 {
--- a/hugolib/handler_file.go
+++ b/hugolib/handler_file.go
@@ -17,7 +17,7 @@
 	"bytes"
 
 	"github.com/dchest/cssmin"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/source"
 )
 
 func init() {
--- a/hugolib/handler_meta.go
+++ b/hugolib/handler_meta.go
@@ -18,7 +18,7 @@
 
 	"fmt"
 
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/source"
 )
 
 var handlers []Handler
--- a/hugolib/handler_page.go
+++ b/hugolib/handler_page.go
@@ -16,8 +16,8 @@
 import (
 	"fmt"
 
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/source"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/source"
 )
 
 func init() {
--- a/hugolib/handler_test.go
+++ b/hugolib/handler_test.go
@@ -17,8 +17,8 @@
 	"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) {
--- a/hugolib/hugo_info.go
+++ b/hugolib/hugo_info.go
@@ -17,7 +17,7 @@
 	"fmt"
 	"html/template"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 var (
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -19,12 +19,12 @@
 	"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.
--- a/hugolib/hugo_sites_build.go
+++ b/hugolib/hugo_sites_build.go
@@ -19,7 +19,7 @@
 	"errors"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // Build builds all sites. If filesystem events are provided,
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -14,10 +14,10 @@
 	"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"
 )
--- a/hugolib/menu_old_test.go
+++ b/hugolib/menu_old_test.go
@@ -21,12 +21,12 @@
 	"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"
 )
--- a/hugolib/multilingual.go
+++ b/hugolib/multilingual.go
@@ -22,8 +22,8 @@
 	"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 {
--- a/hugolib/node_as_page_test.go
+++ b/hugolib/node_as_page_test.go
@@ -23,8 +23,8 @@
 
 	"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"
 )
 
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -22,9 +22,9 @@
 	"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 @@
 	"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 (
--- a/hugolib/page_collections.go
+++ b/hugolib/page_collections.go
@@ -17,7 +17,7 @@
 	"path"
 	"path/filepath"
 
-	"github.com/spf13/hugo/cache"
+	"github.com/gohugoio/hugo/cache"
 )
 
 // PageCollections contains the page collections for a site.
--- a/hugolib/page_collections_test.go
+++ b/hugolib/page_collections_test.go
@@ -21,7 +21,7 @@
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/require"
 )
 
--- a/hugolib/page_output.go
+++ b/hugolib/page_output.go
@@ -19,10 +19,10 @@
 	"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
--- a/hugolib/page_paths.go
+++ b/hugolib/page_paths.go
@@ -20,8 +20,8 @@
 	"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
--- a/hugolib/page_paths_test.go
+++ b/hugolib/page_paths_test.go
@@ -20,7 +20,7 @@
 
 	"fmt"
 
-	"github.com/spf13/hugo/output"
+	"github.com/gohugoio/hugo/output"
 )
 
 func TestPageTargetPath(t *testing.T) {
--- a/hugolib/page_permalink_test.go
+++ b/hugolib/page_permalink_test.go
@@ -21,7 +21,7 @@
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestPermalink(t *testing.T) {
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -26,8 +26,8 @@
 	"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"
 )
--- a/hugolib/pagination.go
+++ b/hugolib/pagination.go
@@ -21,7 +21,7 @@
 	"reflect"
 	"strings"
 
-	"github.com/spf13/hugo/config"
+	"github.com/gohugoio/hugo/config"
 
 	"github.com/spf13/cast"
 )
--- a/hugolib/pagination_test.go
+++ b/hugolib/pagination_test.go
@@ -20,8 +20,8 @@
 	"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"
 )
 
--- a/hugolib/robotstxt_test.go
+++ b/hugolib/robotstxt_test.go
@@ -17,7 +17,7 @@
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 const robotTxtTemplate = `User-agent: Googlebot
--- a/hugolib/rss_test.go
+++ b/hugolib/rss_test.go
@@ -18,7 +18,7 @@
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestRSSOutput(t *testing.T) {
--- a/hugolib/scratch.go
+++ b/hugolib/scratch.go
@@ -18,7 +18,7 @@
 	"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.
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -24,13 +24,13 @@
 	"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.
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -26,14 +26,14 @@
 
 	"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"
 )
 
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -28,9 +28,9 @@
 	"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 @@
 	"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"
 )
--- a/hugolib/siteJSONEncode_test.go
+++ b/hugolib/siteJSONEncode_test.go
@@ -19,7 +19,7 @@
 
 	"path/filepath"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 // Issue #1123
--- a/hugolib/site_output.go
+++ b/hugolib/site_output.go
@@ -19,9 +19,9 @@
 	"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) {
--- a/hugolib/site_output_test.go
+++ b/hugolib/site_output_test.go
@@ -24,8 +24,8 @@
 
 	"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"
 )
 
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -18,11 +18,11 @@
 	"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.
--- a/hugolib/site_sections.go
+++ b/hugolib/site_sections.go
@@ -20,7 +20,7 @@
 	"strings"
 
 	radix "github.com/hashicorp/go-immutable-radix"
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 // Deprecated: Use .Site.Home.Sections.
--- a/hugolib/site_sections_test.go
+++ b/hugolib/site_sections_test.go
@@ -19,7 +19,7 @@
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/require"
 )
 
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -22,11 +22,11 @@
 	"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"
 )
--- a/hugolib/site_url_test.go
+++ b/hugolib/site_url_test.go
@@ -19,8 +19,8 @@
 
 	"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"
 )
 
--- a/hugolib/sitemap_test.go
+++ b/hugolib/sitemap_test.go
@@ -20,8 +20,8 @@
 
 	"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">
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -22,7 +22,7 @@
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestByCountOrderOfTaxonomies(t *testing.T) {
--- a/hugolib/template_engines_test.go
+++ b/hugolib/template_engines_test.go
@@ -20,7 +20,7 @@
 
 	"strings"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestAllTemplateEngines(t *testing.T) {
--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -18,8 +18,8 @@
 	"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"
 )
--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -10,12 +10,12 @@
 	"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 @@
 
 	"log"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/stretchr/testify/require"
 )
--- a/i18n/i18n.go
+++ b/i18n/i18n.go
@@ -15,8 +15,8 @@
 
 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"
 )
 
--- a/i18n/i18n_test.go
+++ b/i18n/i18n_test.go
@@ -22,7 +22,7 @@
 	"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"
--- a/i18n/translationProvider.go
+++ b/i18n/translationProvider.go
@@ -17,8 +17,8 @@
 	"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
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@
 
 	"os"
 
-	"github.com/spf13/hugo/commands"
+	"github.com/gohugoio/hugo/commands"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
--- 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.
--- a/output/docshelper.go
+++ b/output/docshelper.go
@@ -5,7 +5,7 @@
 
 	"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.
--- a/output/layout_base.go
+++ b/output/layout_base.go
@@ -18,7 +18,7 @@
 	"path/filepath"
 	"strings"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 const baseFileBase = "baseof"
--- a/output/layout_test.go
+++ b/output/layout_test.go
@@ -16,7 +16,7 @@
 import (
 	"testing"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 
 	"github.com/stretchr/testify/require"
 )
--- a/output/outputFormat.go
+++ b/output/outputFormat.go
@@ -23,7 +23,7 @@
 
 	"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.
--- a/output/outputFormat_test.go
+++ b/output/outputFormat_test.go
@@ -17,7 +17,7 @@
 	"fmt"
 	"testing"
 
-	"github.com/spf13/hugo/media"
+	"github.com/gohugoio/hugo/media"
 	"github.com/stretchr/testify/require"
 )
 
--- a/releaser/releaser.go
+++ b/releaser/releaser.go
@@ -25,7 +25,7 @@
 	"path/filepath"
 	"regexp"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 const commitPrefix = "releaser:"
--- a/releaser/releaser_test.go
+++ b/releaser/releaser_test.go
@@ -19,7 +19,7 @@
 import (
 	"testing"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/stretchr/testify/require"
 )
 
--- a/source/content_directory_test.go
+++ b/source/content_directory_test.go
@@ -16,7 +16,7 @@
 import (
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 )
 
--- a/source/file.go
+++ b/source/file.go
@@ -18,10 +18,10 @@
 	"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 {
--- a/source/file_test.go
+++ b/source/file_test.go
@@ -18,7 +18,7 @@
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/viper"
 
 	"github.com/stretchr/testify/assert"
--- a/source/filesystem.go
+++ b/source/filesystem.go
@@ -22,7 +22,7 @@
 	"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"
 )
--- 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.
--- 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"
--- a/tpl/cast/init_test.go
+++ b/tpl/cast/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/collections/apply.go
+++ b/tpl/collections/apply.go
@@ -19,7 +19,7 @@
 	"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.
--- a/tpl/collections/apply_test.go
+++ b/tpl/collections/apply_test.go
@@ -18,8 +18,8 @@
 
 	"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"
 )
 
--- a/tpl/collections/collections.go
+++ b/tpl/collections/collections.go
@@ -24,8 +24,8 @@
 	"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.
--- a/tpl/collections/collections_test.go
+++ b/tpl/collections/collections_test.go
@@ -25,10 +25,10 @@
 	"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"
--- a/tpl/collections/index_test.go
+++ b/tpl/collections/index_test.go
@@ -17,7 +17,7 @@
 	"fmt"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
--- 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"
--- a/tpl/collections/init_test.go
+++ b/tpl/collections/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/collections/sort.go
+++ b/tpl/collections/sort.go
@@ -20,7 +20,7 @@
 	"strings"
 
 	"github.com/spf13/cast"
-	"github.com/spf13/hugo/tpl/compare"
+	"github.com/gohugoio/hugo/tpl/compare"
 )
 
 var comp = compare.New()
--- a/tpl/collections/sort_test.go
+++ b/tpl/collections/sort_test.go
@@ -17,7 +17,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestSort(t *testing.T) {
--- a/tpl/collections/where_test.go
+++ b/tpl/collections/where_test.go
@@ -19,7 +19,7 @@
 	"testing"
 	"time"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 func TestWhere(t *testing.T) {
--- 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"
--- a/tpl/compare/init_test.go
+++ b/tpl/compare/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- 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"
--- a/tpl/crypto/init_test.go
+++ b/tpl/crypto/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/data/cache.go
+++ b/tpl/data/cache.go
@@ -19,8 +19,8 @@
 	"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
--- a/tpl/data/data.go
+++ b/tpl/data/data.go
@@ -22,7 +22,7 @@
 	"strings"
 	"time"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
--- 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"
--- a/tpl/data/init_test.go
+++ b/tpl/data/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/data/resources.go
+++ b/tpl/data/resources.go
@@ -22,8 +22,8 @@
 	"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"
 )
 
--- a/tpl/data/resources_test.go
+++ b/tpl/data/resources_test.go
@@ -24,10 +24,10 @@
 	"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"
--- 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"
--- a/tpl/encoding/init_test.go
+++ b/tpl/encoding/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- 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"
--- a/tpl/fmt/init_test.go
+++ b/tpl/fmt/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/images/images.go
+++ b/tpl/images/images.go
@@ -24,7 +24,7 @@
 	_ "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.
--- a/tpl/images/images_test.go
+++ b/tpl/images/images_test.go
@@ -24,8 +24,8 @@
 
 	"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"
--- 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"
--- a/tpl/images/init_test.go
+++ b/tpl/images/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- 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"
--- a/tpl/inflect/init_test.go
+++ b/tpl/inflect/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/internal/templatefuncsRegistry.go
+++ b/tpl/internal/templatefuncsRegistry.go
@@ -31,7 +31,7 @@
 	"strings"
 	"sync"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 )
 
 var TemplateFuncsNamespaceRegistry []func(d *deps.Deps) *TemplateFuncsNamespace
--- 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"
--- a/tpl/lang/init_test.go
+++ b/tpl/lang/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/lang/lang.go
+++ b/tpl/lang/lang.go
@@ -20,7 +20,7 @@
 	"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.
--- a/tpl/lang/lang_test.go
+++ b/tpl/lang/lang_test.go
@@ -4,7 +4,7 @@
 	"fmt"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
--- 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"
--- a/tpl/math/init_test.go
+++ b/tpl/math/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- 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"
--- a/tpl/os/init_test.go
+++ b/tpl/os/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/os/os.go
+++ b/tpl/os/os.go
@@ -20,7 +20,7 @@
 
 	"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.
--- a/tpl/os/os_test.go
+++ b/tpl/os/os_test.go
@@ -19,8 +19,8 @@
 	"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"
--- 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"
--- a/tpl/partials/init_test.go
+++ b/tpl/partials/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/partials/partials.go
+++ b/tpl/partials/partials.go
@@ -20,8 +20,8 @@
 	"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
--- 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"
--- a/tpl/safe/init_test.go
+++ b/tpl/safe/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/safe/safe.go
+++ b/tpl/safe/safe.go
@@ -17,7 +17,7 @@
 	"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.
--- 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"
--- a/tpl/strings/init_test.go
+++ b/tpl/strings/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/strings/strings.go
+++ b/tpl/strings/strings.go
@@ -21,8 +21,8 @@
 	"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.
--- a/tpl/strings/strings_test.go
+++ b/tpl/strings/strings_test.go
@@ -18,7 +18,7 @@
 	"html/template"
 	"testing"
 
-	"github.com/spf13/hugo/deps"
+	"github.com/gohugoio/hugo/deps"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -21,7 +21,7 @@
 	"html/template"
 	texttemplate "text/template"
 
-	bp "github.com/spf13/hugo/bufferpool"
+	bp "github.com/gohugoio/hugo/bufferpool"
 )
 
 var (
--- 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"
--- a/tpl/time/init_test.go
+++ b/tpl/time/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/tplimpl/template.go
+++ b/tpl/tplimpl/template.go
@@ -24,15 +24,15 @@
 
 	"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 (
--- a/tpl/tplimpl/templateFuncster.go
+++ b/tpl/tplimpl/templateFuncster.go
@@ -19,8 +19,8 @@
 	"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.
--- 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{}
--- a/tpl/tplimpl/template_funcs.go
+++ b/tpl/tplimpl/template_funcs.go
@@ -18,27 +18,27 @@
 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() {
--- a/tpl/tplimpl/template_funcs_test.go
+++ b/tpl/tplimpl/template_funcs_test.go
@@ -25,13 +25,13 @@
 	"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"
--- 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"
--- a/tpl/transform/init_test.go
+++ b/tpl/transform/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/transform/transform.go
+++ b/tpl/transform/transform.go
@@ -19,8 +19,8 @@
 	"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.
--- a/tpl/transform/transform_test.go
+++ b/tpl/transform/transform_test.go
@@ -18,10 +18,10 @@
 	"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"
--- 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"
--- a/tpl/urls/init_test.go
+++ b/tpl/urls/init_test.go
@@ -16,8 +16,8 @@
 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"
 )
 
--- a/tpl/urls/urls.go
+++ b/tpl/urls/urls.go
@@ -18,7 +18,7 @@
 	"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.
--- a/transform/chain.go
+++ b/transform/chain.go
@@ -17,7 +17,7 @@
 	"bytes"
 	"io"
 
-	bp "github.com/spf13/hugo/bufferpool"
+	bp "github.com/gohugoio/hugo/bufferpool"
 )
 
 type trans func(rw contentTransformer)
--- a/transform/chain_test.go
+++ b/transform/chain_test.go
@@ -19,7 +19,7 @@
 	"strings"
 	"testing"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 	"github.com/stretchr/testify/assert"
 )
 
--- a/transform/hugogeneratorinject.go
+++ b/transform/hugogeneratorinject.go
@@ -18,7 +18,7 @@
 	"fmt"
 	"regexp"
 
-	"github.com/spf13/hugo/helpers"
+	"github.com/gohugoio/hugo/helpers"
 )
 
 var metaTagsCheck = regexp.MustCompile(`(?i)<meta\s+name=['|"]?generator['|"]?`)