diff --git a/www-apps/mattermost/Manifest b/www-apps/mattermost/Manifest
index 8eb5208..691ca41 100644
--- a/www-apps/mattermost/Manifest
+++ b/www-apps/mattermost/Manifest
@@ -5,14 +5,14 @@ DIST mattermost-5.3.1-webapp.tar.gz 20986850 BLAKE2B 479d124e0b1457affeb488e5f6e
 DIST mattermost-5.3.1.tar.gz 10051783 BLAKE2B 8a97b917a425bfc90ae4768954747811990f88e7442d2c2a5fdbb4c6caa05681f8b75b077f820eaec7d85bb696a4feda6c9d67438f769597f95f5bf21916d364 SHA512 8db50c59de4cdf1804f11d345023d76c50e8e208e08cdaf13cc45a81d3e59e32558b55bb2ac811c3fa3c68210415ba19de0a40b471a4f3942a1c0f32a9716965
 DIST mattermost-5.4.0-webapp.tar.gz 20890784 BLAKE2B 98000b2b33ecca46a02db4746ae5825ba2a0ef7cf6e2f98807f28a4c62c963ef4170276e37d326c5415da5ce276e3bcc56de366c90e35ea51f3777d5c3097c66 SHA512 53be781283b69335be19fbc7c6c50f37230677d51cda63b328a788b1d4e98843bbe6d202f280da13e343a7e7a5e75327f61c435e60c7818b5b9ad2319e953ec3
 DIST mattermost-5.4.0.tar.gz 10086472 BLAKE2B 73da9e97d591e8b7c596eb2f26a938219a08ffaa695f5df9b20b266c1521c46c1747386860e1ced3b48c51fa8beef5d1006db9e6cd73238a4e8dc0410a0dbf24 SHA512 7c68ea6612826f7aa8f8202e50cdd672a3bab2ec2fdc697e30ef4745570a3281090ff448f39a1dff33b8e2f3affe7cff8b3462092b3d98ceff7641efa94c5e30
-DIST mattermost-5.5.0-webapp.tar.gz 20896574 BLAKE2B 86a6ccb66bf5126d44a78cc34e0f11d69fc2297ad9cb043e071bf111894533d53f6dd24f0d706eb2cf3c8e78d19638f9114e55c61bb64cec1b7852c575df0d52 SHA512 ccbf27faa26152c7ae377986c7432b5a8a1f94f9855a904268b26e0fd9c317a02dde6a2677ae6112d92a1233ce6cdb5283b3eb60dc7e8c211967a6146ecda6fb
-DIST mattermost-5.5.0.tar.gz 10085897 BLAKE2B 307d03c27dda7dac221599a6b6ffe164179f51087b4f097e3e9f82fc214f77817db998fcbdce7f6df6af6d54d4358679ec850ab352dc6e4b850619fdbad8fd11 SHA512 a34672b242104c54a436aa2d87341554962e0a79db2dbf6ff0fa742a188bc35266b31b46f6fe5f86327e7bd86d9c9143d953fc8aaf844863e7e524a0ff522e99
+DIST mattermost-5.5.1-webapp.tar.gz 20895276 BLAKE2B fb905c7600754256803f3eee6f05d1eb1670479326e1793616160139eccb3092430cff56c9d58b3b8ecf894804fc55e85df46d273758483d2a023cf24e7b40b5 SHA512 d0aed76b9aa7f5c34cf54b8dfac0538f883cbc75db331333010390b15d0da4ff50df218e205ad4faae7b6ad2e1fc5b3f48ab23acb44c21934ceadc2f2017cc56
+DIST mattermost-5.5.1.tar.gz 10085863 BLAKE2B 48ad8989505018e5721c6e312c0581c1c19e24f67b85d134efb3bbc779d84fbf6783c487a3508cfc31c03c56f72d6e9c6edc453e87c8cf184b7264def239f0b8 SHA512 67d8e2bdc945928bf5fdac32dd2325298d63feb3f3f509bf7b86a42cb483027f17b1b667234b379f13aca832c742fa4d8dcd3f7241ce7c166a01d528e0148a50
 DIST mattermost-team-4.10.4-linux-amd64.tar.gz 47056660 BLAKE2B 1166eb48767088a771e0bce3089856887a74011e3488ceefcb9ce68356e98f96fe5b94f3c85d78598333c8d3bffb3c6df8368a1692af8697c51d2e97e21ae375 SHA512 35c2f446df361a8e9775018297080ed2e8a01e618011b42311d29a3e13c1747d04ef6d82deb4bde82d16cc4e06bf00bc81871cf65fd0811b5e994742f4558322
 DIST mattermost-team-5.3.1-linux-amd64.tar.gz 54631214 BLAKE2B 8e6d206b70fa4e1a286208d8603ce739f87e800a9ebe030afca9cf223359c107a514d9aeef99a6646ccf1b153d92e929859c0471ce248caace9f0cde9f513db4 SHA512 05733a82bfa952b6a3c4dbc717b25ac10ed32a3b4173d62decc75fb888bc13baf1d4dfef3cea85d92bdfb03ed9ae01df8836c5dc52336b94d70abe4e4195c045
 DIST mattermost-team-5.4.0-linux-amd64.tar.gz 60706491 BLAKE2B 00ce2445f096662da231cd2a119e16730fc2fa4d976c6b732809df74cd1619c6e71223ecf0ab3073d1902e0832166cbef1324e50d6b8564887fe69a9ff3c86a9 SHA512 7ceda3739bca7df779bf6ef7aef3c78d7e048fb3160280d056f539b27c40edd4324702ef60fa81910d9293de2befe05e5837160556895c6a2b79d718ae8021f0
-DIST mattermost-team-5.5.0-linux-amd64.tar.gz 60715625 BLAKE2B e5f8951de962c6bab3a9c1465a5018dfceba35f93d7c3077f4f8d2358cbfc86c0f06d890bef167040bf1c4fb4f33c3e90ab5ef7968e7309c4890bd6492d299e7 SHA512 ebf520dc3556fd527c493c4524aee8827a10dca5f2ad0f9cb638030e1fc8d3a73c1dcbe61fdbf1dd7dc7f711f49a8a8cb070639c9ce0d668408b3ac4e27cfe73
+DIST mattermost-team-5.5.1-linux-amd64.tar.gz 55196940 BLAKE2B 4e21b617bfcfbbe500df7b533d129e144148dbd3d18f652e66be54030c484e202aa0349739401a9f87443bcd5aee461dae52d50c692133f26a4daedca7c55e22 SHA512 95319ad734498cf7ebe2bb72a04871d23edacb84c8b90e3d89e0777b3a057227e8c483c0f5a7e6ab0650610e526a261e74214fe8f0001f0ff0a8c5aab90ea3a7
 EBUILD mattermost-4.10.4.ebuild 3844 BLAKE2B 2bc4643d7bf23f0e46251dcb4025f766b1e23a30b0b88f1235ac627f46029d66f423ff83a29bcba14b081fd98ec21cc3d9861df0bb6c98e82ab51d5d8cf1b1f0 SHA512 228ee748dfa5b0a5bb3e4071f4c2c091851579edec7b405b8b6ed06e5f52b65c64106931cde744625e4464988ad3eb5cf1caac29dd6fbc39f11c50fef06cf486
 EBUILD mattermost-5.3.1.ebuild 3825 BLAKE2B 0f52747fa6ff2e1daf39985df1347305e824681810bb239f683a0b1547b87a98b5750ff4ae08afc475455a9c055529ffb604ef6e42d58417fd248f6b66993151 SHA512 d54e241b256d970e3e007aa6a7787c13ed5195b786761894668c0c06371d08c65f65f90792e1880b41ae129db5ee578761a7475f6d640a596cdaead9f5a3fd55
 EBUILD mattermost-5.4.0.ebuild 3825 BLAKE2B 0f52747fa6ff2e1daf39985df1347305e824681810bb239f683a0b1547b87a98b5750ff4ae08afc475455a9c055529ffb604ef6e42d58417fd248f6b66993151 SHA512 d54e241b256d970e3e007aa6a7787c13ed5195b786761894668c0c06371d08c65f65f90792e1880b41ae129db5ee578761a7475f6d640a596cdaead9f5a3fd55
-EBUILD mattermost-5.5.0.ebuild 3825 BLAKE2B 0f52747fa6ff2e1daf39985df1347305e824681810bb239f683a0b1547b87a98b5750ff4ae08afc475455a9c055529ffb604ef6e42d58417fd248f6b66993151 SHA512 d54e241b256d970e3e007aa6a7787c13ed5195b786761894668c0c06371d08c65f65f90792e1880b41ae129db5ee578761a7475f6d640a596cdaead9f5a3fd55
+EBUILD mattermost-5.5.1.ebuild 3884 BLAKE2B a84f7de64f9dbc46b26885027bb141cc3d668c8743e95263dea50f2b4e7cdc48dd01b13e789d2930606ed7163f22347b55bdd8d4719d5004df5a1f52e6afd810 SHA512 b3feaa2c8ecae3044ce414ccabdf0887756fd31a07a1e130802a0fc7bd4a9142219b10b528b0d2def3381e6da80e4f63f06e12e33194bfaea475976b6b351662
 MISC metadata.xml 511 BLAKE2B 072d543a0ca6f8b747549d6802bc2089a2e6d59640a18ee7de6d98e40f4323d7710b5934d710fb93082f06f1ea871711bfccdb3b9dd493c5d16577c1782301a7 SHA512 16203ac2d505933f68efd3f4d137646f1593210b37f0e1cd05420b92f1c64b6235231559f1917075287c85c0a1944f8abd45d2c727502b904e5e229c8238c361
diff --git a/www-apps/mattermost/mattermost-5.5.0.ebuild b/www-apps/mattermost/mattermost-5.5.1.ebuild
similarity index 60%
rename from www-apps/mattermost/mattermost-5.5.0.ebuild
rename to www-apps/mattermost/mattermost-5.5.1.ebuild
index f91a9ac..91b62a2 100644
--- a/www-apps/mattermost/mattermost-5.5.0.ebuild
+++ b/www-apps/mattermost/mattermost-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,25 +22,25 @@ RDEPEND=""
 S="${WORKDIR}/src/github.com/mattermost/mattermost-server"
 
 src_unpack() {
-	mkdir -p ${WORKDIR}/bin/ ${WORKDIR}/src/github.com/mattermost/
+	mkdir -p "${WORKDIR}/bin/" "${WORKDIR}/src/github.com/mattermost/"
 	default
-	mv "${WORKDIR}/mattermost-server-${PV}" ${WORKDIR}/src/github.com/mattermost/mattermost-server
-	use build-client && mv "${WORKDIR}/mattermost-webapp-${PV}" ${WORKDIR}/src/github.com/mattermost/mattermost-webapp
+	mv "${WORKDIR}/mattermost-server-${PV}" "${WORKDIR}/src/github.com/mattermost/mattermost-server"
+	use build-client && mv "${WORKDIR}/mattermost-webapp-${PV}" "${WORKDIR}/src/github.com/mattermost/mattermost-webapp"
 }
 
 src_prepare() {
 	# We are not using docker, no need to stop it.
-	sed -r -i ${S}/Makefile \
+	sed -r -i "${S}/Makefile" \
 		-e 's/^clean: stop-docker/clean:/'
 
 	# Enforce build hash to Arch Linux (Enterprise hash is already set to
 	# none), instead of the official git hash value.
-	sed -r -i ${S}/Makefile \
+	sed -r -i "${S}/Makefile" \
 		-e "s/^(\s*)BUILD_HASH(_ENTERPRISE)? =.*/\1BUILD_HASH\2 = Gentoo \(${CHOST}\)/" \
 		-e 's/-X (.*)(\$\(BUILD_HASH(_ENTERPRISE)?\))(.*)/-X '\''\1\2'\''\4/'
 
 	# The configuration isn't available at this time yet, modify the default.
-	sed -r -i ${S}/build/release.mk \
+	sed -r -i "${S}/build/release.mk" \
 		-e 's/\$\(DIST_PATH\)\/config\/config.json/\$\(DIST_PATH\)\/config\/default.json/'
 
 	# The Go programming language only supports 8 instruction sets, therefore
@@ -48,15 +48,15 @@ src_prepare() {
 	# src.: https://golang.org/doc/install/source#introduction
 	case "${CHOST}" in
 		i686*)
-			sed -r -i ${S}/build/release.mk \
+			sed -r -i "${S}/build/release.mk" \
 				-e "s/amd64/386/"
 			;;
 		armv8*|aarch64*)
-			sed -r -i ${S}/build/release.mk \
+			sed -r -i "${S}/build/release.mk" \
 				-e "s/amd64/arm64/"
 			;;
 		arm*)
-			sed -r -i ${S}/build/release.mk \
+			sed -r -i "${S}/build/release.mk" \
 				-e "s/amd64/arm/"
 			;;
 	esac
@@ -64,15 +64,15 @@ src_prepare() {
 	# Remove platform specific lines from the Makefile from the line beginning
 	# with that statement to the end of file (we do not care of the additional
 	# file copy, nor the tar compression defined below the file).
-	sed '/# ----- PLATFORM SPECIFIC -----/,//d' -i ${S}/build/release.mk
+	sed '/# ----- PLATFORM SPECIFIC -----/,//d' -i "${S}/build/release.mk"
 
 	eapply_user
 }
 
 src_compile() {
-	export BUILD_NUMBER=${PVR}
+	export BUILD_NUMBER="${PVR}"
 	export LANG=C
-	export GOPATH=${WORKDIR}
+	export GOPATH="${WORKDIR}"
 
 	emake build-linux
 	use build-client && emake build-client && emake package
@@ -80,28 +80,28 @@ src_compile() {
 
 src_install() {
 	install -dm755 \
-			"${D}"/usr/share/webapps \
-			"${D}"/var/log/${PN} \
-			"${D}"/usr/share/doc/${PN} || die
+			"${D}/usr/share/webapps" \
+			"${D}/var/log/${PN}" \
+			"${D}/usr/share/doc/${PN}" || die
 
 	if use build-client; then
-		cp -a ${S}/dist/${PN} "${D}"/usr/share/webapps/ || die
+		cp -a "${S}/dist/${PN}" "${D}"/usr/share/webapps/ || die
 	else
-		install -dm755 "${D}"/usr/share/webapps/${PN} || die
-		cp -a ${WORKDIR}/${PN}/client ${WORKDIR}/${PN}/fonts ${WORKDIR}/${PN}/i18n ${WORKDIR}/${PN}/templates "${D}"/usr/share/webapps/${PN} || die
+		install -dm755 "${D}/usr/share/webapps/${PN}" || die
+		cp -a "${WORKDIR}/${PN}/client" "${WORKDIR}/${PN}/fonts" "${WORKDIR}/${PN}/i18n" "${WORKDIR}/${PN}/templates" "${D}/usr/share/webapps/${PN}" || die
 	fi
 
 	rm -rf \
-	   ${D}/usr/share/webapps/${PN}/logs \
-	   ${D}/usr/share/webapps/${PN}/plugins \
-	   ${D}/usr/share/webapps/${PN}/MIT-COMPILED-LICENSE.md \
-	   ${D}/usr/share/webapps/${PN}/NOTICE.txt \
-	   ${D}/usr/share/webapps/${PN}/README.md || die
+	   "${D}/usr/share/webapps/${PN}/logs" \
+	   "${D}/usr/share/webapps/${PN}/plugins" \
+	   "${D}/usr/share/webapps/${PN}/MIT-COMPILED-LICENSE.md" \
+	   "${D}/usr/share/webapps/${PN}/NOTICE.txt" \
+	   "${D}/usr/share/webapps/${PN}/README.md" || die
 
-	keepdir /var/log/${PN}/
-	keepdir /var/lib/${PN}/plugins/
-	ln -s /var/log/${PN}/ ${D}/usr/share/webapps/${PN}/logs || die
-	ln -s /var/lib/${PN}/plugins/ ${D}/usr/share/webapps/${PN}/plugins || die
+	keepdir "/var/log/${PN}/"
+	keepdir "/var/lib/${PN}/plugins/"
+	ln -s "/var/log/${PN}/" "${D}/usr/share/webapps/${PN}/logs" || die
+	ln -s "/var/lib/${PN}/plugins/" "${D}/usr/share/webapps/${PN}/plugins" || die
 
 	insinto /etc/
 	sed -e 's@"Directory": ".*"@"Directory": "/var/lib/mattermost/"@g' \
@@ -111,6 +111,6 @@ src_install() {
 
 	dodoc NOTICE.txt README.md
 
-	dobin ${WORKDIR}/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	dobin "${WORKDIR}/bin/${PN}"
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
 }