diff --git a/ChangeLog b/ChangeLog
index 90109f37f5..88d930111f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-17  Bastien Nocera  <hadess@hadess.net>
+
+	* sys/Makefile.am: make the qcam plugin build only
+	only platforms using NASM, ie. x86
+
 2002-01-06 Rodney Dawes <dobey@free.fr>
 
 	* configure.ac: added -lm to cdparanoia check so it works,
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 2a022facaa..fde0de70a3 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -5,7 +5,9 @@ else
 OSS_DIR=
 endif
 
-if USE_QCAM
+# FIXME it's broken
+# hadess@hadess.net
+if HAVE_NASM
 QCAM_DIR=qcam
 else
 QCAM_DIR=