diff --git a/games-server/factorio-server/Manifest b/games-server/factorio-server/Manifest
index 3ab2002..9677375 100644
--- a/games-server/factorio-server/Manifest
+++ b/games-server/factorio-server/Manifest
@@ -1,2 +1,3 @@
 DIST factorio-server-0.17.79.tar.xz 32864892 BLAKE2B c583e6c53b08977bf3ddfced5908babd02020ad932ca83fceaab2ef86a15ac62e2755dd9576bdf57dcb79ecc0291ef45772bc824222654c6f73cdcb090e5b928 SHA512 a1201a20914c0c90a91c9a329a4edb15f5904fc4f5b70687204381c9fc5ab157b4dd2a11928ac705de1afd44150f600d8087d6a52e16f9b236a51769d97a9bb6
 DIST factorio-server-0.18.30.tar.xz 44201904 BLAKE2B 61924932928a9a8c30385ea3785d58a342e747395c541f1b36723a4eee066252c7010ce1945d1fe8f7463272fdf34e10d8e8ce1bd81d1b60daeb5c87395a2dc2 SHA512 94144bd675d972941c4f7afe9b76234f8e9be5f5d39335ba48833a0dd6985c6f660de7920f8f5f4213507f57688e8722e08e73adf52ba6fb60e32f447d8c64e2
+DIST factorio-server-0.18.31.tar.xz 44333756 BLAKE2B 65301b67b1d9057da3d94bc73735863dbf61fa2e163a32f38f0c387910883f06bcc1e7bc83e174c7a35f9e806e53fd3e6ba65e5de8282d9b50901e9747e487dd SHA512 8590ab0ec7f4c8097cb357378cf7986e1d18b5feaf468b4eb7e573621042807fe4bfd8ef81494222fdf8e709b38ae528d791693679890c333b580a3862df02f4
diff --git a/games-server/factorio-server/factorio-server-0.18.31.ebuild b/games-server/factorio-server/factorio-server-0.18.31.ebuild
new file mode 100644
index 0000000..df197b3
--- /dev/null
+++ b/games-server/factorio-server/factorio-server-0.18.31.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."
+}