diff --git a/init.sh b/init.sh
index 72e964e..f256552 100755
--- a/init.sh
+++ b/init.sh
@@ -49,7 +49,7 @@ SERVER_DIR=/opt/teamspeak3
 RUNSCRIPT=$SERVER_DIR/ts3server_minimal_runscript.sh
 CONF_DIR=$SERVER_DIR
 
-if [ ! -f "$RUNSCRIPT" ]; then
+if [ ! -f "$RUNSCRIPT" ] || [ ! -z "$UPGRADE" ]; then
 	echo Starting Initialization
         URL=http://dl.4players.de/ts/releases/$TS_VERSION/teamspeak3-server_linux_$ARCH-$TS_VERSION.tar.bz2
 	TMPFILE=/tmp/server.tar.bz2
@@ -64,12 +64,17 @@ if [ ! -f "$RUNSCRIPT" ]; then
 		fi
 	fi
 	tar -xjvf $TMPFILE -C /opt
-	mv /opt/teamspeak3-server_linux_$ARCH/* /opt/teamspeak3/
+	mv -u /opt/teamspeak3-server_linux_$ARCH/* /opt/teamspeak3/
 	rm -rf /opt/teamspeak3-server_linux_$ARCH
 	rm -f $TMPFILE
 	main_config
 	db_config
  
 fi
-wait_for_mysql
-$RUNSCRIPT inifile=$CONF_DIR/ts3server.ini
+if [ -z "$UPGRADE" ]; then
+	wait_for_mysql
+	$RUNSCRIPT inifile=$CONF_DIR/ts3server.ini
+else
+	echo "Upgrade complete"
+	exit 0
+fi