diff --git a/README.md b/README.md
index 818dae5..68a5195 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ pongo2 is a Django-syntax like templating-language ([official website](https://w
 Install/update using `go get` (no dependencies required by pongo2):
 
 ```sh
-go get -u github.com/flosch/pongo2/v5
+go get -u github.com/flosch/pongo2/v6
 ```
 
 Please use the [issue tracker](https://github.com/flosch/pongo2/issues) if you're encountering any problems with pongo2 or if you need help with implementing tags or filters ([create a ticket!](https://github.com/flosch/pongo2/issues/new)).
@@ -142,7 +142,7 @@ fmt.Println(out) // Output: Hello Florian!
 package main
 
 import (
-    "github.com/flosch/pongo2/v5"
+    "github.com/flosch/pongo2/v6"
     "net/http"
 )
 
diff --git a/go.mod b/go.mod
index 67d2187..332c0fd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/flosch/pongo2/v5
+module github.com/flosch/pongo2/v6
 
 go 1.18
 
diff --git a/pongo2.go b/pongo2.go
index 74d22f0..0cceef7 100644
--- a/pongo2.go
+++ b/pongo2.go
@@ -1,7 +1,7 @@
 package pongo2
 
 // Version string
-const Version = "5.0.0"
+const Version = "6.0.0"
 
 // Must panics, if a Template couldn't successfully parsed. This is how you
 // would use it:
diff --git a/pongo2_issues_test.go b/pongo2_issues_test.go
index 0c4351d..e78463d 100644
--- a/pongo2_issues_test.go
+++ b/pongo2_issues_test.go
@@ -3,7 +3,7 @@ package pongo2_test
 import (
 	"testing"
 
-	"github.com/flosch/pongo2/v5"
+	"github.com/flosch/pongo2/v6"
 )
 
 func TestIssue151(t *testing.T) {
diff --git a/pongo2_template_test.go b/pongo2_template_test.go
index cd7ce77..89fe6f8 100644
--- a/pongo2_template_test.go
+++ b/pongo2_template_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/flosch/pongo2/v5"
+	"github.com/flosch/pongo2/v6"
 )
 
 type stringerValueType int
diff --git a/pongo2_test.go b/pongo2_test.go
index 795918e..569a4c6 100644
--- a/pongo2_test.go
+++ b/pongo2_test.go
@@ -3,7 +3,7 @@ package pongo2_test
 import (
 	"testing"
 
-	"github.com/flosch/pongo2/v5"
+	"github.com/flosch/pongo2/v6"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/template_tests/CHANGELOG b/template_tests/CHANGELOG
new file mode 100644
index 0000000..aeea1e7
--- /dev/null
+++ b/template_tests/CHANGELOG
@@ -0,0 +1,12 @@
+# Changelog
+
+## v6.0.0
+
+- Go 1.18 is now the minimum required Go version.
+- Improved block performance (#293).
+- Support for variable subscript syntax (for maps/arrays/slices), such as `mymap["foo"]` or
+  `myarray[0]` (#281).
+- Backwards-incompatible change: `block.Super` won't be escaped anymore by default (#301).
+- `nil` is now supported in function calls (#277).
+
+Thanks to all contributors.
diff --git a/template_tests/pongo2ctx.tpl.out b/template_tests/pongo2ctx.tpl.out
index 28cbf7c..f4965a3 100644
--- a/template_tests/pongo2ctx.tpl.out
+++ b/template_tests/pongo2ctx.tpl.out
@@ -1 +1 @@
-5.0.0
\ No newline at end of file
+6.0.0
\ No newline at end of file