diff --git a/multimedia/xvid/xvid.conf b/multimedia/xvid/xvid.conf
index 956772e96..13536c814 100644
--- a/multimedia/xvid/xvid.conf
+++ b/multimedia/xvid/xvid.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: package/.../xvid/xvid.conf
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -16,7 +16,7 @@
 # the xvidcore assembly is not position independent code
 # see: http://trac.opensde.org/ticket/97
 #
-[ "$SDECFG_X8664_OPT" != "opteron" ] || var_append confopt ' ' "--disable-assembly"
+[ "$SDECFG_X8664_OPT" == "opteron" ] || var_append confopt ' ' "--disable-assembly"
 
 hook_add preconf 5 "cd build/generic"
 
diff --git a/multimedia/xvid/xvid.desc b/multimedia/xvid/xvid.desc
index 233418695..1a2301205 100644
--- a/multimedia/xvid/xvid.desc
+++ b/multimedia/xvid/xvid.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] 
 [COPY] Filename: package/.../xvid/xvid.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
@@ -31,6 +31,8 @@
 
 [C] extra/multimedia
 
+[F] FPIC-QUIRK
+
 [L] OpenSource
 [S] Beta
 [V] 1.1.2