diff --git a/base/src/server/client.qc b/base/src/server/client.qc
index 82ac8317..7496a963 100644
--- a/base/src/server/client.qc
+++ b/base/src/server/client.qc
@@ -18,7 +18,6 @@
 void
 Game_RunClientCommand(void)
 {
-	Footsteps_Update();
 	player pl = (player)self;
 	pl.Physics_Run();
 }
diff --git a/base/src/shared/player.qc b/base/src/shared/player.qc
index 6593e083..432a487f 100644
--- a/base/src/shared/player.qc
+++ b/base/src/shared/player.qc
@@ -29,12 +29,9 @@ enumflags
 
 class player:NSClientPlayer
 {
-	PREDICTED_INT(mode_tempstate);
+	PREDICTED_INT(mode_tempstate)
 
 #ifdef CLIENT
-	virtual void(void) draw;
-	virtual float() predraw;
-	virtual void(void) postdraw;
 	virtual void(float,float) ReceiveEntity;
 	virtual void(void) PredictPreFrame;
 	virtual void(void) PredictPostFrame;
diff --git a/build.cfg b/build.cfg
index 06ac98dd..fef6bc22 100644
--- a/build.cfg
+++ b/build.cfg
@@ -32,7 +32,7 @@ BUILD_IQMTOOL=1
 BUILD_IMGTOOL=1
 
 # Specify which engine revision to build, these are considered 'stable'; 0 = latest
-BUILD_ENGINEREVISION=6306
+BUILD_ENGINEREVISION=git
 
 # Whether or not to run 'git pull' or 'svn up' before building a component
 BUILD_UPDATE=1
diff --git a/build_engine.sh b/build_engine.sh
index 1a3b2f0b..2dc8a748 100755
--- a/build_engine.sh
+++ b/build_engine.sh
@@ -1,15 +1,17 @@
 #!/bin/sh
 . ./build.cfg
 
-if ! [ -x "$(command -v svn)" ]
+if ! [ -x "$(command -v git)" ]
 then
-	printf "'svn' is not installed.\n"
+	printf "'git' is not installed.\n"
 	exit
 fi
 
 set -e
 
 FTE_MAKEFILE=./src/engine/engine/Makefile
+FTE_SVNDIR=./src/engine/.svn
+
 COMPILE_SYS=$(uname)
 COMPILE_OS=$(uname -o)
 
@@ -103,6 +105,13 @@ fi
 
 mkdir -p ./bin
 
+# SVN is no more
+if [ -d "$FTE_SVNDIR" ]
+then
+	printf "Detected Subversion repo... Please remove ./src/engine before proceeding."
+	exit
+fi
+
 if [ -f "$FTE_MAKEFILE" ]
 then
 	if [ "$BUILD_UPDATE" -eq 1 ]
@@ -110,11 +119,13 @@ then
 		printf "Engine is present, updating...\n"
 		cd ./src/engine/
 
-		if [ "$BUILD_ENGINEREVISION" -eq 0 ]
+		if [ -z "$(git status --untracked-files=no --porcelain)" ]
 		then
-			svn up
-		else
-			svn -r $BUILD_ENGINEREVISION up
+			# TODO: let devs decide to fetch changes instead first
+			git pull --rebase
+		else 
+			# Uncommitted changes
+			printf "You have uncommitted changes. Will not pull --rebase.\n"
 		fi
 
 		cd ./engine
@@ -124,13 +135,7 @@ then
 else
 	printf "Engine is NOT present, cloning...\n"
 	cd ./src/
-
-	if [ "$BUILD_ENGINEREVISION" -eq 0 ]
-	then
-		svn checkout https://svn.code.sf.net/p/fteqw/code/trunk engine
-	else
-		svn -r $BUILD_ENGINEREVISION checkout https://svn.code.sf.net/p/fteqw/code/trunk engine
-	fi
+	git clone "https://github.com/VeraVisions/fteqw" engine
 	cd ./engine/engine
 fi