diff --git a/xine-lib.spec b/xine-lib.spec
index c7b6ef8..7bb8a4d 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -17,15 +17,14 @@
 %define _disable_gnomevfs --disable-gnomevfs
 %define with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
 %define with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
-%define with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
 %define with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
 %define with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
-%define with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif # Fedora
 
-%if 0%{?fedora} > 8 || 0%{?rhel} > 5
-%define _without_arts --without-arts
+%if 0%{?fedora} || 0%{?rhel} > 5
+%define _without_arts --without-art
+%define _with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %endif
 
 %if 0%{?fedora} > 11
@@ -73,7 +72,7 @@ BuildRequires:  libGLU-devel
 %if 0%{?_enable_v4l:1}
 BuildRequires:  libv4l-devel
 %endif
-%if %{with_xcb}
+%if 0%{?_with_xcb:1}
 BuildRequires:  libxcb-devel
 %endif # xcb
 # Video
@@ -380,7 +379,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
 %endif # vidix
-%if %{with_xcb}
+%if 0%{?_with_xcb:1}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
 %endif # xcb