diff --git a/games-server/factorio-server/Manifest b/games-server/factorio-server/Manifest
index d554991..98d9f7a 100644
--- a/games-server/factorio-server/Manifest
+++ b/games-server/factorio-server/Manifest
@@ -1 +1,2 @@
 DIST factorio-server-0.17.79.tar.xz 32864892 BLAKE2B c583e6c53b08977bf3ddfced5908babd02020ad932ca83fceaab2ef86a15ac62e2755dd9576bdf57dcb79ecc0291ef45772bc824222654c6f73cdcb090e5b928 SHA512 a1201a20914c0c90a91c9a329a4edb15f5904fc4f5b70687204381c9fc5ab157b4dd2a11928ac705de1afd44150f600d8087d6a52e16f9b236a51769d97a9bb6
+DIST factorio-server-0.18.28.tar.xz 44226624 BLAKE2B e9f15683395773cb8a35ce3833aa53ae307bd2a85c5a86226181f36ebef07e8fd3f8b44c66c0d158a843193dcd81d3096788d57999f1bca7b1b825f53fe51d67 SHA512 2447db9631ebc2522b015431765831fdb77ef827cd4127e5fe2c8e52a198ddc681be4702e6b0aa20460660ee5a118dd5ab5cc5d9f9f3a4da918d77c76e024bb5
diff --git a/games-server/factorio-server/factorio-server-0.17.79.ebuild b/games-server/factorio-server/factorio-server-0.17.79.ebuild
index de12599..c1d9bec 100644
--- a/games-server/factorio-server/factorio-server-0.17.79.ebuild
+++ b/games-server/factorio-server/factorio-server-0.17.79.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Factorio is a game in which you build and maintain factories"
 HOMEPAGE="https://www.factorio.com/"
 SRC_URI="https://www.factorio.com/get-download/${PV}/headless/linux64 -> ${P}.tar.xz"
 LICENSE="Factorio"
-SLOT="0"
+SLOT="${PV%.*}"
 KEYWORDS="~amd64"
 
 DEPEND="
diff --git a/games-server/factorio-server/factorio-server-0.18.28.ebuild b/games-server/factorio-server/factorio-server-0.18.28.ebuild
new file mode 100644
index 0000000..c1d9bec
--- /dev/null
+++ b/games-server/factorio-server/factorio-server-0.18.28.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Factorio is a game in which you build and maintain factories"
+HOMEPAGE="https://www.factorio.com/"
+SRC_URI="https://www.factorio.com/get-download/${PV}/headless/linux64 -> ${P}.tar.xz"
+LICENSE="Factorio"
+SLOT="${PV%.*}"
+KEYWORDS="~amd64"
+
+DEPEND="
+	acct-group/factorio
+	acct-user/factorio
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/factorio"
+
+src_install() {
+	insinto /opt/factorio
+	doins -r *
+	exeinto /opt/factorio/bin/x64
+	doexe bin/x64/factorio
+
+	newinitd "${FILESDIR}"/factorio.initd factorio
+	newconfd "${FILESDIR}"/factorio.confd factorio
+}
+
+pkg_postinst() {
+	einfo "As factorio user, copy data/server-settings.example.json to"
+	einfo "config/server-settings.json and data/server-whitelist.example.json"
+	einfo "to config/server-whitelist.json and adapt it according to your needs."
+	einfo ""
+	einfo "Then, run bin/x64/factorio --create ./saves/my-save.zip to create a"
+	einfo "new map, and start the service."
+}