diff --git a/.travis.yml b/.travis.yml
index 3393bfe..2c2e0f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ env:
     - SRCROOT="${GOPATH}/src/github.com/mattermost"
     - GOARM=7
   matrix:
-    - V=5.1.0
+    - V=5.2.0
 before_install:
   - install -d "${GOPATH}/bin" "${GOROOT}" "${SRCROOT}/mattermost-"{server,webapp}
   # download & extract golang
@@ -51,7 +51,7 @@ script:
   # 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}"
+  - make config-reset build-linux package-linux -C "${SRCROOT}/mattermost-server" PLUGIN_PACKAGES="" GO="GOARCH=arm $(which go)" BUILD_NUMBER="dev-arm-tag${V}"
   # workaround (instead of patch): Makefile creates *-amd64.tar.gz
   - mv "${SRCROOT}/mattermost-server/dist/mattermost-team-linux-amd64.tar.gz" "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz"
   - sha512sum "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz" | tee "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz.sha512sum"
diff --git a/build-release.patch b/build-release.patch
index 7214aa7..8482b34 100644
--- a/build-release.patch
+++ b/build-release.patch
@@ -11,7 +11,7 @@ diff --git a/build/release.mk b/build/release.mk
 index 238343e..1b7859f 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -60,7 +60,7 @@ endif
+@@ -61,7 +61,7 @@ endif
  	cp README.md $(DIST_PATH)
  
  	@# ----- PLATFORM SPECIFIC -----
@@ -20,10 +20,10 @@ index 238343e..1b7859f 100644
  	@# Make osx package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -90,7 +90,7 @@ endif
- 	@# Cleanup
+@@ -106,7 +106,7 @@ endif
  	rm -f $(DIST_PATH)/bin/mattermost.exe
  	rm -f $(DIST_PATH)/bin/platform.exe
+ 	rm -f $(DIST_PATH)/prepackaged_plugins/*
 -
 +package-linux: package
  	@# Make linux package