diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 57a4b0aa50..9c0fa9e8a1 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -25,7 +25,7 @@ lib32disabled=yes
 
 hostmakedepends="pkg-config perl flex"
 makedepends="
- libfl-devel damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0.26 presentproto
+ damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0.26 presentproto
  dri2proto>=2.1 dri3proto xf86driproto randrproto videoproto compositeproto scrnsaverproto
  resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto xcb-util-devel
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel libudev-devel>=183
@@ -111,7 +111,7 @@ xorg-server-devel_package() {
 		libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel
 		libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel
 		libxshmfence-devel libdrm-devel>=2.4.34"
-	if [ "$build_option_opengl" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		depends+=" MesaLib-devel"
 	fi
 	short_desc+=" - development files"