diff --git a/ChangeLog b/ChangeLog
index c1320d705..aadfc9b04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-16  Eric Anholt  <anholt@FreeBSD.org>
+
+	* configure.ac:
+	Bug #5453: Don't forget to still do AM_CONDITIONAL for XVMC even if XV
+	is disabled, and also force XVMC disabled if XV is disabled.
+	(Dag-Erling Sm�rgrav)
+
 2006-02-16  Keith Packard  <keithp@keithp.com>
 
 	* miext/shadow/shrotpackYX.h:
diff --git a/configure.ac b/configure.ac
index 7318cd788..2a5b79289 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,10 +483,13 @@ if test "x$XV" = xyes; then
 	AC_DEFINE(XV, 1, [Support Xv extension])
 	AC_DEFINE(XvExtension, 1, [Build Xv extension])
 	REQUIRED_MODULES="$REQUIRED_MODULES videoproto"
-	AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
-	if test "x$XVMC" = xyes; then
-		AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
-	fi
+else
+	XVMC=no
+fi
+
+AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
+if test "x$XVMC" = xyes; then
+	AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
 fi
 
 AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])