diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg
index e1d7dd58a5b6321657d3f54c0371fedbb95e63f6..51432c0473c0bfa616023e7c06bb7283ac216c8a 100644
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -528,3 +528,32 @@ environment =
   CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include
   PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[libXi]
+recipe = slapos.recipe.cmmi
+url = http://www.x.org/releases/X11R7.7/src/everything/libXi-1.6.1.tar.bz2
+md5sum = 78ee882e1ff3b192cf54070bdb19938e
+pkg_config_depends = ${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+environment =
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+configure-options =
+  --disable-docs
+  --disable-specs
+  --disable-static
+  --without-fop
+  --without-xmlto
+
+[libXtst]
+recipe = slapos.recipe.cmmi
+url = http://www.x.org/releases/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2
+md5sum = e8abc5c00c666f551cf26aa53819d592
+configure-options =
+  --disable-specs
+  --disable-static
+  --without-fop
+  --without-xmlto
+  --without-xsltproc
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libXi:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig