diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..20e5bfa8
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,17 @@
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish:
+    if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+
+      - name: Publish to Hex.pm
+        uses: erlangpack/github-action@v1
+        env:
+          HEX_API_KEY: ${{ secrets.HEX_API_KEY }}
diff --git a/.gitignore b/.gitignore
index bb59f193..b9606c10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 *.swp
 *.beam
 *.dump
+rebar.lock
diff --git a/CHANGES.md b/CHANGES.md
index 65e171c6..b5c61dbe 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Version 2.22.0 released 2021-08-23
+
+* Renamed master branch to main
+* Add unquote_path/1 for separate '+' encoding
+  https://github.com/mochi/mochiweb/pull/231
+
 Version 2.21.0 released 2021-06-06
 
 * Upgrade crypto functions to support OTP 23
diff --git a/src/mochiweb.app.src b/src/mochiweb.app.src
index 7b9578b3..f0059da1 100644
--- a/src/mochiweb.app.src
+++ b/src/mochiweb.app.src
@@ -1,7 +1,7 @@
 %% This is generated from src/mochiweb.app.src
 {application, mochiweb,
  [{description, "MochiMedia Web Server"},
-  {vsn, "2.21.0"},
+  {vsn, "2.22.0"},
   {modules, []},
   {registered, []},
   {env, []},
diff --git a/support/templates/mochiwebapp_skel/rebar.config b/support/templates/mochiwebapp_skel/rebar.config
index da4939c7..da560ebd 100644
--- a/support/templates/mochiwebapp_skel/rebar.config
+++ b/support/templates/mochiwebapp_skel/rebar.config
@@ -2,6 +2,6 @@
 {erl_opts, [debug_info]}.
 {deps, [
   {mochiweb, ".*",
-   {git, "git://github.com/mochi/mochiweb.git", {branch, "master"}}}]}.
+   {git, "git://github.com/mochi/mochiweb.git", {branch, "main"}}}]}.
 {cover_enabled, true}.
 {eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.