diff --git a/debian/vlc.docs b/debian/vlc.docs
index 4fce168f7d..8ef7154ae4 100644
--- a/debian/vlc.docs
+++ b/debian/vlc.docs
@@ -2,4 +2,3 @@ AUTHORS
 INSTALL
 README
 TODO
-ChangeLog
diff --git a/src/misc/tests.c b/src/misc/tests.c
index c1fe1eb22b..095f2a71e4 100644
--- a/src/misc/tests.c
+++ b/src/misc/tests.c
@@ -66,6 +66,9 @@ int TestMethod( char * psz_var, char * psz_method )
  *****************************************************************************/
 int TestMMX( void )
 {
+#ifndef __i386__
+    return( 0 );
+#else
 /* FIXME: under beos, gcc does not support the following inline assembly */ 
 #ifdef SYS_BEOS
     return( 1 );
@@ -132,7 +135,7 @@ int TestMMX( void )
         return( 0 );
 
     return( 1 );
-
+#endif
 #endif
 }
 
diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index afae81f8a3..15fe340bda 100644
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
+#include <string.h>                                                /* memset */
 
 #include "config.h"
 #include "common.h"