diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 1c25e74fc8..06dc55e672 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -24,8 +24,8 @@ $SCRIPTS/build libpciaccess
 $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
-$SCRIPTS/build libdrm
-$SCRIPTS/build Mesa
+$SCRIPTS/build $LIBDRM
+$SCRIPTS/build $MESA
 $SCRIPTS/build openssl
 $SCRIPTS/build freetype
 $SCRIPTS/build pixman
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index d4b352685c..658fc6bd09 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -9,8 +9,8 @@ $SCRIPTS/install freetype
 $SCRIPTS/install openssl
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
-$SCRIPTS/install libdrm
-$SCRIPTS/install Mesa
+$SCRIPTS/install $LIBDRM
+$SCRIPTS/install $MESA
 $SCRIPTS/install pixman
 $SCRIPTS/install udev