diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index 53f8871c5b1cf..9db52a1d12c16 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,4 +1,4 @@
 DIST hedgewars-src-0.9.23.tar.bz2 173042171 BLAKE2B 8458cce459e59227a92f70a1a1593ce0e222030f519e554bea067890394322e8346d062a8552472280401272691d5ebb4c2e85d9e8824b3513d70d24cca4b880 SHA512 b9bcd6d32c7bb97c2766aacbc759dd48b7a4c7a72003ab2bf31cdfac94a6e08de740a689458c276d3c35b90e89a1af6c200f98f463e9554e8b176b5706dc3090
-DIST hedgewars-src-0.9.24.tar.bz2 175085892 BLAKE2B 7282423af3f6d1d26665b827aa54ab2cb9cabd6a8db156e54019deb47a34d6ece2af5f1faf2896ce38eaf48885cb6b87a2616d86100d24f5714a2d0d63e7b114 SHA512 6f6d5e6b7b460b70ec7e20fd66e96d7ad82d2d8d90aa5e89522268c71b90016343e3edd8a3186314546044639e9623af6d0ee2df38395ea925e5588280db27b1
+DIST hedgewars-src-0.9.24.1.tar.bz2 175069915 BLAKE2B 5c49b91b9a77a110a7bc8667f9621c92d638950071c8db7493b7797c2e504a214052fad6ae8554d844146eecabd794529891aebf4e54ee73f8a447ab11c6c7da SHA512 b0b166c807e0d08a763e5e88e178d6e629baa420685bbfe381db7b5ecf003175892f8c2e3b75f1f6d7663335bd5b417d1a2afdc89b9d56b348b056ee3490ed2f
 DIST hedgewars_0.9.22-dfsg-7.debian.tar.xz 79016 BLAKE2B dda854b87db808520e3b6405e6eb28db085d23b78e4cdcce25a94992bc2551e2436401766cc39bf52fb7c5ad0e946a9792cc333813454fdfd615d2569e3fb16a SHA512 011d44989b6fcad9ae7a20fcb11a4e2b9a75d1ace6c6e4c2139cd7e67f13ea21d90b6c8a7afb76fa9a06c32537b00b8b4b7689967b3019300e93a7a6fe3e0fbf
 DIST hedgewars_0.9.23-dfsg-2.debian.tar.xz 77488 BLAKE2B 5de6fa2ad91f1346f679d07b3b445bd119d2cdd3c715ace20fc36abe726330ccf9a9b69ec56c58cfca4cc6256ff248b0cc0b0e27caf2a79df0f1662ea7727e8e SHA512 03680446930279178ddff85a87fc27b7c26ad6d850c8f26571517ebbd6dff296db216da6b56d4bd55c659786bc5c76e2b67a63052ee38e150655e60c08f7c491
diff --git a/games-strategy/hedgewars/hedgewars-0.9.24.ebuild b/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
similarity index 85%
rename from games-strategy/hedgewars/hedgewars-0.9.24.ebuild
rename to games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
index fba8ed68b349b..3e592af7ebfaa 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.24.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libav"
+IUSE="libav server"
 
 QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
 QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
@@ -41,7 +41,21 @@ CDEPEND="
 	!libav? ( media-video/ffmpeg:= )"
 DEPEND="${CDEPEND}
 	>=dev-lang/fpc-2.4
-	dev-qt/linguist-tools:5"
+	dev-qt/linguist-tools:5
+	server? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/entropy
+		dev-haskell/hslogger
+		>=dev-haskell/mtl-2
+		>=dev-haskell/network-2.3
+		dev-haskell/random
+		dev-haskell/regex-tdfa
+		dev-haskell/sandi
+		dev-haskell/sha
+		dev-haskell/vector
+		dev-haskell/utf8-string
+		>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
+	)"
 RDEPEND="${CDEPEND}
 	app-arch/xz-utils
 	>=media-fonts/dejavu-2.28
@@ -59,7 +73,7 @@ src_configure() {
 		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
 		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
 		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
-		-DNOSERVER=TRUE
+		-DNOSERVER=$(usex server FALSE TRUE)
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
 		-DPHYSFS_SYSTEM=ON
 		# Need to tell the build system where the fonts are located
diff --git a/games-strategy/hedgewars/metadata.xml b/games-strategy/hedgewars/metadata.xml
index 78274e0fa550c..c8b942447c41c 100644
--- a/games-strategy/hedgewars/metadata.xml
+++ b/games-strategy/hedgewars/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<use>
+	<flag name="server">Enable local server</flag>
+</use>
 </pkgmetadata>