diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index 2129120b6..c0d29dc0c 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -3,13 +3,19 @@
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
+PACKAGE_NAME=`grep AppFullName AndroidAppSettings.cfg | sed 's/.*=//'`
+
 ../setEnvironment-armeabi-v7a.sh sh -c '\
 $CC $CFLAGS -c main.c -o main.o' || exit 1
 
+
+
+[ -e xserver/android ] || git submodule update --init xserver || exit 1
 cd xserver
 [ -e configure ] || autoreconf --force -v --install || exit 1
 cd android
 
+env PACKAGE_NAME=$PACKAGE_NAME \
 ./build.sh || exit 1
 
 ../../../setEnvironment-armeabi-v7a.sh sh -c '\
diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver
index e8559f1c9..eb6eaf433 160000
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver
@@ -1 +1 @@
-Subproject commit e8559f1c939049eed3b967b28f3d9c28a8f6d73e
+Subproject commit eb6eaf433b5ebb5bc31b23b8b1006653c9b4ceb4