diff --git a/build.sh b/build.sh
index f43ac1e..eee29a6 100644
--- a/build.sh
+++ b/build.sh
@@ -92,7 +92,8 @@ patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
 patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
 	--strip=1 < "${HOME}/go-backport.patch"
 sed -i \
-	-e 's#go generate#env --unset=GOOS --unset=GOARCH &#' \
+	-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \
+	-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \
 	-e 's#PWD#CURDIR#' \
 	"${HOME}/go/src/github.com/mattermost/mattermost-server/Makefile" \
 	"${HOME}/go/src/github.com/mattermost/mattermost-server/build/release.mk"
diff --git a/dependabot/Gopkg.lock b/dependabot/Gopkg.lock
index 9ef9df9..08f4547 100644
--- a/dependabot/Gopkg.lock
+++ b/dependabot/Gopkg.lock
@@ -50,7 +50,7 @@
   version = "v3.0.4"
 
 [[projects]]
-  digest = "1:ec74c516fa4cf2358c8e5a21d44c1515e7c24164b747488af30510d03b24540b"
+  digest = "1:956bb9e1bca6146cea0047ea6cbdc65c36c871285efb7455d94bb06e786fc71d"
   name = "github.com/mattermost/mattermost-server"
   packages = [
     "mlog",
@@ -60,8 +60,8 @@
     "utils/markdown",
   ]
   pruneopts = ""
-  revision = "4d802131407033b1e7dfdb003f8d2b28f66be711"
-  version = "v5.15.1"
+  revision = "6597fdb40134965e26f715854dc85f5e6cfaa6df"
+  version = "v5.16.0"
 
 [[projects]]
   digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
diff --git a/dependabot/Gopkg.toml b/dependabot/Gopkg.toml
index 0db1cbe..85cd057 100644
--- a/dependabot/Gopkg.toml
+++ b/dependabot/Gopkg.toml
@@ -1,3 +1,3 @@
 [[constraint]]
   name = "github.com/mattermost/mattermost-server"
-  version = "v5.15.1"
+  version = "v5.16.0"