diff --git a/.travis.yml b/.travis.yml
index 5577dff..62d6763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,15 +21,13 @@ env:
     - SRCROOT="${GOPATH}/src/github.com/mattermost"
     - GOARM=7
   matrix:
-    - V=4.10.1
+    - V=5.0.0
 before_install:
-  - install -d "${GOPATH}" "${GOROOT}" "${SRCROOT}/mattermost-"{server,webapp}
+  - install -d "${GOPATH}/bin" "${GOROOT}" "${SRCROOT}/mattermost-"{server,webapp}
   # download & extract golang
   - wget -q "https://storage.googleapis.com/golang/go${GOV}.linux-amd64.tar.gz"
   - sha256sum --check <<< "${GOSHA}"
   - tar -C "${HOME}/${GOV}" -xzf "go${GOV}.linux-amd64.tar.gz"
-  # set maximum number of open file descriptors
-  - ulimit -n 8096
   # download & extract mattermost-server
   - wget -q "https://github.com/mattermost/mattermost-server/archive/v${V}.tar.gz" -O mattermost-server.tar.gz
   - tar -C "${SRCROOT}/mattermost-server" --strip-components=1 -xf mattermost-server.tar.gz
@@ -39,12 +37,9 @@ before_install:
 script:
   - make build -C "${SRCROOT}/mattermost-webapp"
   # workaround (instead of patch): platform binary is in GOOS_GOARCH, Makefile expects it in linux_amd64
-  - install -d "${GOPATH}/bin/linux_amd64"
-  - ln -s "${GOPATH}/bin/linux_arm/platform" "${GOPATH}/bin/linux_amd64/platform"
-  # install dependencies
-  - go get -d github.com/mattermost/mattermost-server/...
-  # revert reverted commit, https://github.com/mattermost/mattermost-server/pull/8537
-  - wget -qO - https://patch-diff.githubusercontent.com/raw/mattermost/mattermost-server/pull/8537.patch | patch -d "${SRCROOT}/mattermost-server" -Rp1
+  - ln -s "${GOPATH}/bin/linux_arm" "${GOPATH}/bin/linux_amd64"
+  # adapt and revert reverted commit, https://github.com/mattermost/mattermost-server/pull/8537
+  - patch -d "${SRCROOT}/mattermost-server" -p1 < "${TRAVIS_BUILD_DIR}/build-release.patch"
   # workaround (instead of patch): overwrite GO variable to enforce desired GOARCH
   - make config-reset build-linux package-linux -C "${SRCROOT}/mattermost-server" GO="GOARCH=arm $(which go)" BUILD_NUMBER="dev-arm-tag${V}"
   # workaround (instead of patch): Makefile creates *-amd64.tar.gz
diff --git a/build-release.patch b/build-release.patch
new file mode 100644
index 0000000..1431bdf
--- /dev/null
+++ b/build-release.patch
@@ -0,0 +1,33 @@
+From 556e16211ed1b4c146ca2a094688618458182ae7 Mon Sep 17 00:00:00 2001
+From: Your Name <you@example.com>
+Date: Wed, 6 Jun 2018 12:34:56 +0100
+Subject: [PATCH] Split make goal
+
+---
+ build/release.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/release.mk b/build/release.mk
+index 238343e..1b7859f 100644
+--- a/build/release.mk
++++ b/build/release.mk
+@@ -72,7 +72,7 @@ endif
+ 	cp README.md $(DIST_PATH)
+ 
+ 	@# ----- PLATFORM SPECIFIC -----
+-
++_:
+ 	@# Make osx package
+ 	@# Copy binary
+ ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
+@@ -102,7 +102,7 @@ endif
+ 	@# Cleanup
+ 	rm -f $(DIST_PATH)/bin/mattermost.exe
+ 	rm -f $(DIST_PATH)/bin/platform.exe
+-
++package-linux: package
+ 	@# Make linux package
+ 	@# Copy binary
+ ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
+-- 
+2.11.0