diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 926a10c2fb..249512f024 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -26,6 +26,12 @@ XORG_SRC="$PKG_BUILD/hw/xfree86"
 
 get_graphicdrivers
 
+if [ "$COMPOSITE_SUPPORT" = "yes" ]; then
+  XORG_COMPOSITE="--enable-composite"
+else
+  XORG_COMPOSITE="--diable-composite"
+fi
+
 if [ "$XINERAMA_SUPPORT" = "yes" ]; then
   XORG_XINERAMA="--enable-xinerama"
 else
@@ -57,7 +63,7 @@ cd $PKG_BUILD
             --enable-aiglx \
             --enable-glx-tls \
             --enable-registry \
-            --disable-composite \
+            $XORG_COMPOSITE \
             $XORG_XINERAMA \
             --enable-mitshm \
             --disable-xres \
diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
index d04e16feef..b914504e76 100644
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@@ -36,6 +36,11 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 get_graphicdrivers
+if [ "$COMPOSITE_SUPPORT" = "yes" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS libXcomposite"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXcomposite"
+fi
+
 if [ "$XINERAMA_SUPPORT" = "yes" ]; then
   PKG_DEPENDS="$PKG_DEPENDS libXinerama"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXinerama"