diff --git a/.gitmodules b/.gitmodules
index 45ca316..e6ceafd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -133,3 +133,23 @@
 	url = https://gitlab.freedesktop.org/xorg/lib/libxrender.git
 	ignore = dirty
 	shallow = true
+[submodule "ext/libxtst"]
+	path = ext/libxtst
+	url = https://gitlab.freedesktop.org/xorg/lib/libxtst.git
+	ignore = dirty
+	shallow = true
+[submodule "ext/libxext"]
+	path = ext/libxext
+	url = https://gitlab.freedesktop.org/xorg/lib/libxext.git
+	ignore = dirty
+	shallow = true
+[submodule "ext/libxi"]
+	path = ext/libxi
+	url = https://gitlab.freedesktop.org/xorg/lib/libxi.git
+	ignore = dirty
+	shallow = true
+[submodule "ext/libxfixes"]
+	path = ext/libxfixes
+	url = https://gitlab.freedesktop.org/xorg/lib/libxfixes.git
+	ignore = dirty
+	shallow = true
diff --git a/ext/libxext b/ext/libxext
new file mode 160000
index 0000000..efdcbb7
--- /dev/null
+++ b/ext/libxext
@@ -0,0 +1 @@
+Subproject commit efdcbb7634501e1117d422636a0a75d7ea84b16b
diff --git a/ext/libxfixes b/ext/libxfixes
new file mode 160000
index 0000000..84df9cb
--- /dev/null
+++ b/ext/libxfixes
@@ -0,0 +1 @@
+Subproject commit 84df9cb81cc31bbed27ba241a23ae04f61da57db
diff --git a/ext/libxi b/ext/libxi
new file mode 160000
index 0000000..b87c312
--- /dev/null
+++ b/ext/libxi
@@ -0,0 +1 @@
+Subproject commit b87c312590877800b4e18a17a012b47839f5c06b
diff --git a/ext/libxtst b/ext/libxtst
new file mode 160000
index 0000000..9f5621a
--- /dev/null
+++ b/ext/libxtst
@@ -0,0 +1 @@
+Subproject commit 9f5621a410f18149d4c76b02daa7f1a98b4a2c16
diff --git a/linux/.gitignore b/linux/.gitignore
index f35abc2..ed7e589 100644
--- a/linux/.gitignore
+++ b/linux/.gitignore
@@ -32,3 +32,7 @@ crosstool-ng
 */libffi
 */ncurses
 */libxrender
+*/libxi
+*/libxtst
+*/libxfixes
+*/libxext
diff --git a/linux/build.sh b/linux/build.sh
index 83b04fa..1851494 100755
--- a/linux/build.sh
+++ b/linux/build.sh
@@ -677,6 +677,106 @@ then
 	popd
 fi
 
+# build libxext
+if [ ! -f $home/libxext/stamp ]
+then
+ 	pushd $ext/libxext
+ 	NOCONFIGURE=1 ./autogen.sh --prefix=$dist
+ 	popd
+
+	mkdir -p $home/libxext
+	pushd $home/libxext
+	PKG_CONFIG_PATH=$dist/lib/pkgconfig:$dist/share/pkgconfig \
+	PKG_CONFIG_SYSROOT_DIR=$dist \
+	LDFLAGS="--sysroot=$dist" \
+	$ext/libxext/configure \
+		--host=$SDK_TARGET \
+		--target=$SDK_TARGET \
+		--prefix="" \
+		--with-sysroot=$dist \
+		--enable-malloc0returnsnull \
+		$SDK_LIBXEXT_ARGS
+	make
+	make DESTDIR=$dist install
+	touch stamp
+	popd
+fi
+
+# build libxfixes
+if [ ! -f $home/libxfixes/stamp ]
+then
+ 	pushd $ext/libxfixes
+ 	NOCONFIGURE=1 ./autogen.sh --prefix=$dist
+ 	popd
+
+	mkdir -p $home/libxfixes
+	pushd $home/libxfixes
+	PKG_CONFIG_PATH=$dist/lib/pkgconfig:$dist/share/pkgconfig \
+	PKG_CONFIG_SYSROOT_DIR=$dist \
+	LDFLAGS="--sysroot=$dist" \
+	$ext/libxfixes/configure \
+		--host=$SDK_TARGET \
+		--target=$SDK_TARGET \
+		--prefix="" \
+		--with-sysroot=$dist \
+		--enable-malloc0returnsnull \
+		$SDK_LIBXFIXES_ARGS
+	make
+	make DESTDIR=$dist install
+	touch stamp
+	popd
+fi
+
+# build libxi
+if [ ! -f $home/libxi/stamp ]
+then
+ 	pushd $ext/libxi
+ 	NOCONFIGURE=1 ./autogen.sh --prefix=$dist
+ 	popd
+
+	mkdir -p $home/libxi
+	pushd $home/libxi
+	PKG_CONFIG_PATH=$dist/lib/pkgconfig:$dist/share/pkgconfig \
+	PKG_CONFIG_SYSROOT_DIR=$dist \
+	LDFLAGS="--sysroot=$dist" \
+	$ext/libxi/configure \
+		--host=$SDK_TARGET \
+		--target=$SDK_TARGET \
+		--prefix="" \
+		--with-sysroot=$dist \
+		--enable-malloc0returnsnull \
+		$SDK_LIBXI_ARGS
+	make
+	make DESTDIR=$dist install
+	touch stamp
+	popd
+fi
+
+# build libxtst
+if [ ! -f $home/libxtst/stamp ]
+then
+ 	pushd $ext/libxtst
+ 	NOCONFIGURE=1 ./autogen.sh --prefix=$dist
+ 	popd
+
+	mkdir -p $home/libxtst
+	pushd $home/libxtst
+	PKG_CONFIG_PATH=$dist/lib/pkgconfig:$dist/share/pkgconfig \
+	PKG_CONFIG_SYSROOT_DIR=$dist \
+	LDFLAGS="--sysroot=$dist" \
+	$ext/libxtst/configure \
+		--host=$SDK_TARGET \
+		--target=$SDK_TARGET \
+		--prefix="" \
+		--with-sysroot=$dist \
+		--enable-malloc0returnsnull \
+		$SDK_LIBXTST_ARGS
+	make
+	make DESTDIR=$dist install
+	touch stamp
+	popd
+fi
+
 # adjust symlinks to relative paths
 symlinks -cr $dist