diff --git a/multimedia/xvid/xvid.conf b/multimedia/xvid/xvid.conf
index 13536c814..de205ca52 100644
--- a/multimedia/xvid/xvid.conf
+++ b/multimedia/xvid/xvid.conf
@@ -15,8 +15,9 @@
 
 # the xvidcore assembly is not position independent code
 # see: http://trac.opensde.org/ticket/97
-#
-[ "$SDECFG_X8664_OPT" == "opteron" ] || var_append confopt ' ' "--disable-assembly"
+if [ "$SDECFG_ARCH" = "x86-64" ] ; then
+	var_append confopt ' ' "--disable-assembly"
+fi
 
 hook_add preconf 5 "cd build/generic"