diff --git a/xine-lib.spec b/xine-lib.spec
index c19b862..de1ac9a 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -3,7 +3,6 @@
 # - pulseaudio
 
 %define         codecdir %{_libdir}/codecs
-#%define         vdrver 0.7.9
 
 Summary:        Xine library
 Name:           xine-lib
@@ -26,6 +25,9 @@ BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-
 # Video
 BuildRequires:  freetype-devel SDL-devel libtheora-devel libmng-devel
 BuildRequires:  aalib-devel >= 1.4
+%if 0%{?_with_caca:1}
+BuildRequires:  libcaca-devel >= 0.99
+%endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif
@@ -36,24 +38,17 @@ BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
 BuildRequires:  jack-audio-connection-kit-devel
-%if 0%{?_with_caca:1}
-BuildRequires:  libcaca-devel >= 0.99
-%endif
 # CDs
 BuildRequires:  libcdio-devel
 # Other
 BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
 BuildRequires:  libtool >= 1.4.0 /usr/bin/automake-1.9 samba-common
 
-#Provides:        %{name}(vdr) = %{vdrver}
-
 %package devel
 Summary:         Xine library development files
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
 Requires:        pkgconfig zlib-devel
-#Requires:        %{name}(vdr) = %{vdrver}
-#Provides:        %{name}-devel(vdr) = %{vdrver}
 
 %package extras
 Summary:         Additional plugins for xine-lib
@@ -76,17 +71,17 @@ This package contains development files for xine-lib.
 
 %description extras
 This package contains extra plugins for xine-lib:
-  - Arts
-  - ESD
-  - Jack
+  - aRts
+  - EsounD
+  - JACK
   - GNOME VFS
   - SDL
-  - AAlib
+  - AA-lib
 %if 0%{?_with_caca:1}
-  - CACAlib
+  - Libcaca
 %endif
 %if 0%{!?_without_imagemagick:1}
-  - image decoding
+  - Image decoding
 %endif
 %if 0%{!?_without_directfb:1}
   - DirectFB output
@@ -97,7 +92,6 @@ This package contains extra plugins for xine-lib:
 %prep
 %setup -q
 %patch1 -p0 -b .nomcpu
-###cp -p debian/changelog ChangeLog.vdr
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 %patch7 -p0 -b .multilib-devel
@@ -201,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so
-#%{_libdir}/xine/plugins/%{version}/xineplug_inp_vdr.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
@@ -248,6 +241,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files extras
+%defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so