diff --git a/games-server/factorio-server/Manifest b/games-server/factorio-server/Manifest
index 96c6d0a..e166515 100644
--- a/games-server/factorio-server/Manifest
+++ b/games-server/factorio-server/Manifest
@@ -2,3 +2,4 @@ DIST factorio-server-0.17.79.tar.xz 32864892 BLAKE2B c583e6c53b08977bf3ddfced590
 DIST factorio-server-0.18.35.tar.xz 44124420 BLAKE2B 82fec80574e394e8142a07f67fc5f3d36770509cc4760cf6b4c22ed39fe2e80324d4902406b180023abfd69549fb51be5c5b3633166d2e3bcd6883ef677522a5 SHA512 61d53d16588c3d72101b9861c1be98e325738dd5f7914a514be93dd3d0721f0c67212c7d9b24808d6601f0a8f4fc6d2a667daf3621f1becc6ea4c5a5d11e8cb4
 DIST factorio-server-0.18.36.tar.xz 44154576 BLAKE2B 48ddb0ea225344e3b0b74dbee338c902a1c1db6ac3ba14e1724d59769b5c1d45318bcb49df14ea5f81d373240a8d63bc3378d8afd5cfd994400b540b813bf531 SHA512 c842680f172770f48a5bae056b6e6cdf8498a94990ca15a829f46e0fcd1258445b6f0191a93e72c70ab8a31af4dc0fc1a68e77a606b1332790da030f625a6dd5
 DIST factorio-server-0.18.38.tar.xz 44812460 BLAKE2B b622cc09623304dfb2ea94ef08acb8da31942360582310b2545af109b9d26aa915e04f1c3833047c7e01d9e93dce9a62ac4cf73ad39351bb82dc37eb1c94c0ba SHA512 9afee60565d2fa44f66b3b417d81937e060f1deb2a91af678c6e1471d5a5c31cd8ab0b591f489b2a2559e487c2e78e227bd17e4013c473cb799e82de8eff9fc4
+DIST factorio-server-0.18.40.tar.xz 44800040 BLAKE2B 229f3088101fddced62d7fbb834128cee5679fb549cdae3ed1ee3b2fc64a8c02328fa57a350e546895098b222be91c9ead6254e41c8f2f6e7d6a9cc1001cd105 SHA512 a2026732ca57562db7725d048218719dc4c23f166ba42b77373d06e4431da306e255f63e7f5a9b6d48a8683c4150fe89676b797fb419c0e4da9e099224843c6a
diff --git a/games-server/factorio-server/factorio-server-0.18.40.ebuild b/games-server/factorio-server/factorio-server-0.18.40.ebuild
new file mode 100644
index 0000000..df197b3
--- /dev/null
+++ b/games-server/factorio-server/factorio-server-0.18.40.ebuild
@@ -0,0 +1,41 @@
+# 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%.*}"
+
+DEPEND="
+	acct-group/factorio
+	acct-user/factorio
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/factorio"
+
+src_install() {
+	insinto "/opt/factorio-${SLOT}"
+	doins -r *
+	exeinto "/opt/factorio-${SLOT}"/bin/x64
+	doexe bin/x64/factorio
+
+	newinitd "${FILESDIR}"/factorio.initd "factorio-${SLOT}"
+	newconfd "${FILESDIR}"/factorio.confd "factorio-${SLOT}"
+
+	sed -i "s/%SLOT%/${SLOT}/" "${D}/etc/conf.d/factorio-${SLOT}" || \
+		die "SLOTing sed failed"
+}
+
+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."
+}