diff --git a/package/xorg/mesalib/mesalib.conf b/package/xorg/mesalib/mesalib.conf
index fa343be13..55f21cd3e 100644
--- a/package/xorg/mesalib/mesalib.conf
+++ b/package/xorg/mesalib/mesalib.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 
 mesalib_prepatch() {
 	if [ $xpkg = mesademos ]; then
@@ -23,8 +24,18 @@ mesalib_postmake() {
 var_append CC_WRAPPER_FILTER "|" \
 	"sed -r 's,-lglut,-L/usr/X11/lib\n-lXmu\n-lXi\n-lglut,g'"
 
-# FIXME: use a different makeopt if arch != x86
-makeopt="linux-x86"
+case "$arch_machine" in
+x86|ppc)
+	makeopt="linux-dri-$arch_target"
+	;;
+x86_64)
+	makeopt="linux-dri-x86-64"
+	;;
+*)
+	makeopt="linux-dri"
+	;;
+esac
+
 
 if [ $xpkg = mesademos ]; then
 	makeinstopt=""