diff --git a/ChangeLog b/ChangeLog
index 7b355d60b..f00d438f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* hw/xfree86/dixmods/Makefile.am:
 	Make DBE support conditional.  (Enrico Wiegelt)
 
+	* hw/xfree86/loader/xf86sym.c:
+	Make Xv symbols conditional.  (Enrico Wiegelt)
+
 2006-05-15  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index e99c34301..32fe012ad 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -619,6 +619,7 @@ LOOKUP xfree86LookupTab[] = {
 #endif
 
     /* xf86xv.c */
+#ifdef XV
     SYMFUNC(xf86XVScreenInit)
     SYMFUNC(xf86XVRegisterGenericAdaptorDriver)
     SYMFUNC(xf86XVListGenericAdaptors)
@@ -635,6 +636,7 @@ LOOKUP xfree86LookupTab[] = {
     SYMFUNC(xf86XvMCScreenInit)
     SYMFUNC(xf86XvMCCreateAdaptorRec)
     SYMFUNC(xf86XvMCDestroyAdaptorRec)
+#endif
 
     /* xf86VidMode.c */
     SYMFUNC(VidModeExtensionInit)