diff --git a/project/jni/application/ninslash/AndroidPreBuild.sh b/project/jni/application/ninslash/AndroidPreBuild.sh
index af7f259fe..7ff73dd8a 100755
--- a/project/jni/application/ninslash/AndroidPreBuild.sh
+++ b/project/jni/application/ninslash/AndroidPreBuild.sh
@@ -35,6 +35,7 @@ for ARCH in armeabi-v7a x86; do
 	echo "Building teeworlds_srv for $ARCH"
 	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../../setEnvironment-$ARCH.sh \
 		sh -c '
+		set -x
 		OBJS=
 		for F in `cat ../server-sources.txt`; do
 			dirname objs/$F.o | xargs mkdir -p
@@ -42,11 +43,12 @@ for ARCH in armeabi-v7a x86; do
 			OBJS="$OBJS objs/$F.o"
 			$CXX $CFLAGS -fno-exceptions -fno-rtti --std=c++11 -flto -Wall -DCONF_RELEASE -I src -c $F -o objs/$F.o || exit 1
 		done
-		echo Linking teeworlds_srv
-		$CXX $CFLAGS -fno-exceptions -fno-rtti $LDFLAGS -pie -flto -pthread -o teeworlds_srv $OBJS || exit 1
-		$STRIP --strip-unneeded teeworlds_srv
+		echo Linking ninslash_srv
+		$CXX $CFLAGS -fno-exceptions -fno-rtti $OBJS $LDFLAGS -pie -flto -pthread -o ninslash_srv || exit 1
+		$STRIP --strip-unneeded ninslash_srv
 		' || exit 1
-	cp teeworlds_srv bin-$ARCH/
+	mkdir -p bin-$ARCH
+	cp ninslash_srv bin-$ARCH/
 	cd bin-$ARCH
 	zip ../../AndroidData/binaries-$ARCH.zip *
 	cd ..
diff --git a/project/jni/application/ninslash/server-sources.txt b/project/jni/application/ninslash/server-sources.txt
index ddc25d6b9..ebd70aad3 100644
--- a/project/jni/application/ninslash/server-sources.txt
+++ b/project/jni/application/ninslash/server-sources.txt
@@ -1,77 +1,9 @@
- src/engine/shared/engine.cpp
- src/engine/shared/kernel.cpp
- src/engine/shared/network_server.cpp
- src/engine/shared/compression.cpp
- src/engine/shared/config.cpp
- src/engine/shared/jobs.cpp
- src/engine/shared/huffman.cpp
- src/engine/shared/network.cpp
- src/engine/shared/datafile.cpp
- src/engine/shared/masterserver.cpp
- src/engine/shared/econ.cpp
- src/engine/shared/stream.cpp
- src/engine/shared/network_console.cpp
- src/engine/shared/memheap.cpp
- src/engine/shared/console.cpp
- src/engine/shared/network_console_conn.cpp
- src/engine/shared/ringbuffer.cpp
- src/engine/shared/linereader.cpp
- src/engine/shared/netban.cpp
- src/engine/shared/mapchecker.cpp
- src/engine/shared/map.cpp
- src/engine/shared/network_client.cpp
- src/engine/shared/storage.cpp
- src/engine/shared/demo.cpp
- src/engine/shared/packer.cpp
- src/engine/shared/snapshot.cpp
- src/engine/shared/network_conn.cpp
- src/engine/shared/filecollection.cpp
- src/base/system.c
- src/engine/server/register.cpp
- src/engine/server/server.cpp
- src/game/gamecore.cpp
- src/game/localization.cpp
- src/game/collision.cpp
- src/game/astar.cpp
- src/game/layers.cpp
- src/game/pathfinding.cpp
+ src/game/server/*.cpp
+ src/game/server/*/*.cpp
+ src/game/*.cpp
+ src/engine/server/*.cpp
+ src/engine/shared/*.cpp
+ src/base/*.c
  src/game/generated/nethash.cpp
  src/game/generated/protocol.cpp
- src/game/server/eventhandler.cpp
- src/game/server/ai.cpp
- src/game/server/gameworld.cpp
- src/game/server/gamecontroller.cpp
- src/game/server/ai/tdm_ai.cpp
- src/game/server/ai/dm_ai.cpp
- src/game/server/ai/texas_ai.cpp
- src/game/server/entity.cpp
- src/game/server/gamemodes/texasrun.cpp
- src/game/server/gamemodes/tdm.cpp
- src/game/server/gamemodes/ctf.cpp
- src/game/server/gamemodes/dm.cpp
- src/game/server/gamemodes/base.cpp
- src/game/server/entities/spinlaser.cpp
- src/game/server/entities/powerupper.cpp
- src/game/server/entities/building.cpp
- src/game/server/entities/pickup.cpp
- src/game/server/entities/character.cpp
- src/game/server/entities/character.cpp
- src/game/server/entities/character.cpp
- src/game/server/entities/character.cpp
- src/game/server/entities/character.cpp
- src/game/server/entities/laser.cpp
- src/game/server/entities/lightning.cpp
- src/game/server/entities/deathray.cpp
- src/game/server/entities/monster.cpp
- src/game/server/entities/flag.cpp
- src/game/server/entities/bomb.cpp
- src/game/server/entities/arrow.cpp
- src/game/server/entities/electro.cpp
- src/game/server/entities/superexplosion.cpp
- src/game/server/entities/smokescreen.cpp
- src/game/server/entities/turret.cpp
- src/game/server/entities/projectile.cpp
- src/game/server/entities/staticlaser.cpp
- src/game/server/player.cpp
- src/game/server/gamecontext.cpp
  src/game/generated/server_data.cpp
diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src
index ec8223f1e..1e7d43a87 160000
--- a/project/jni/application/ninslash/src
+++ b/project/jni/application/ninslash/src
@@ -1 +1 @@
-Subproject commit ec8223f1e2f895cb852cc972b7e2fbde4d5a9b46
+Subproject commit 1e7d43a87129824b115722474e089934e333fe3b