diff --git a/lib/libXvMC/ChangeLog b/lib/libXvMC/ChangeLog
index 6993e6e85..e2f2f060d 100644
--- a/lib/libXvMC/ChangeLog
+++ b/lib/libXvMC/ChangeLog
@@ -1,3 +1,24 @@
+commit 44a462835cbe263451a463af17f0fbedc1c957b2
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Tue Oct 4 22:09:12 2016 +0200
+
+    libXvMC 1.0.10
+    
+    Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 2cd95e7da8367cccdcdd5c9b160012d1dec5cbdb
+Author: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date:   Sun Sep 25 22:34:27 2016 +0200
+
+    Avoid buffer underflow on empty strings.
+    
+    If an empty string is received from an x-server, do not underrun the
+    buffer by accessing "rep.nameLen - 1" unconditionally, which could end
+    up being -1.
+    
+    Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
+    Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
+
 commit ab0d28935987d48e9359023e82f9d56aa7e4bc95
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Mar 14 10:10:05 2015 -0700
diff --git a/lib/libXvMC/compile b/lib/libXvMC/compile
index a85b723c7..531136b06 100644
--- a/lib/libXvMC/compile
+++ b/lib/libXvMC/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/lib/libXvMC/configure b/lib/libXvMC/configure
index fa6b95fb4..3ded9b060 100644
--- a/lib/libXvMC/configure
+++ b/lib/libXvMC/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libXvMC 1.0.9.
+# Generated by GNU Autoconf 2.69 for libXvMC 1.0.10.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libXvMC'
 PACKAGE_TARNAME='libXvMC'
-PACKAGE_VERSION='1.0.9'
-PACKAGE_STRING='libXvMC 1.0.9'
+PACKAGE_VERSION='1.0.10'
+PACKAGE_STRING='libXvMC 1.0.10'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1358,7 +1358,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libXvMC 1.0.9 to adapt to many kinds of systems.
+\`configure' configures libXvMC 1.0.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXvMC 1.0.9:";;
+     short | recursive ) echo "Configuration of libXvMC 1.0.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1555,7 +1555,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXvMC configure 1.0.9
+libXvMC configure 1.0.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1879,7 +1879,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXvMC $as_me 1.0.9, which was
+It was created by libXvMC $as_me 1.0.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2708,7 +2708,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXvMC'
- VERSION='1.0.9'
+ VERSION='1.0.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18411,7 +18411,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libXvMC $as_me 1.0.9, which was
+This file was extended by libXvMC $as_me 1.0.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18477,7 +18477,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libXvMC config.status 1.0.9
+libXvMC config.status 1.0.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/libXvMC/configure.ac b/lib/libXvMC/configure.ac
index 01f286fc7..c0b87c975 100644
--- a/lib/libXvMC/configure.ac
+++ b/lib/libXvMC/configure.ac
@@ -21,7 +21,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXvMC], [1.0.9],
+AC_INIT([libXvMC], [1.0.10],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXvMC])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])