diff --git a/.cvsignore b/.cvsignore
index e2128b7..bb4470f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-xine-lib-1.1.10-pruned.tar.bz2
-xine-lib-1.1.10-autotools.patch.bz2
+xine-lib-1.1.10.1-pruned.tar.bz2
+xine-lib-1.1.10.1-autotools.patch.bz2
diff --git a/sources b/sources
index 29adf6a..028f7ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-38b23253ba2fff335bb41cf8d7e87afe  xine-lib-1.1.10-pruned.tar.bz2
-823ca0360094a627857a303e069f5439  xine-lib-1.1.10-autotools.patch.bz2
+3e78ed0690314436b0a74d1d11535fea  xine-lib-1.1.10.1-pruned.tar.bz2
+b7e702d0bd235e7102efaa11caea2895  xine-lib-1.1.10.1-autotools.patch.bz2
diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh
index dddb8d6..5710edf 100755
--- a/xine-lib-cleanup-sources.sh
+++ b/xine-lib-cleanup-sources.sh
@@ -22,14 +22,14 @@ tar -xjf $tarball
 cd $dir
 
 # Main libraries
-for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libspucmml libspucc liba52 libdts; do
+for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do
     echo "removing src/$remove..."
     rm -rf src/$remove 
     sed -i -e "/$remove/d" src/Makefile.am
     sed -i -e "/^src\/$remove/d" configure.ac
 done
 # Input plugin libraries
-for remove in libdvdnav vcd; do
+for remove in vcd; do
     echo "removing src/input/$remove..."
     rm -rf src/input/$remove 
     sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am
diff --git a/xine-lib.spec b/xine-lib.spec
index 21601d6..eadfc22 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -6,6 +6,7 @@
 #   http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
 #   --> not yet:
 #    http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
+# - external dvdnav - not compatible as of 1.1.9.1 and 4.1.1
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
@@ -32,7 +33,7 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.10
+Version:        1.1.10.1
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
@@ -87,9 +88,7 @@ BuildRequires:  jack-audio-connection-kit-devel
 # CDs
 BuildRequires:  libcdio-devel
 # Other
-BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
-# samba-common in <= FC-6, libsmbclient-devel in FC7+
-BuildRequires:  %{_includedir}/libsmbclient.h
+BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel libsmbclient-devel
 
 %package devel
 Summary:         Xine library development files
@@ -180,7 +179,6 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 %endif # directfb
     --disable-a52dec \
     --disable-mad \
-    --disable-dvdnavtest --with-external-dvdnav \
     --disable-vcd \
     --disable-asf \
     --disable-faad \
@@ -243,133 +241,136 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/xine.5*
 %dir %{_libdir}/xine/
 %dir %{_libdir}/xine/plugins/
-%dir %{_libdir}/xine/plugins/%{version}/
-%{_libdir}/xine/plugins/%{version}/mime.types
+%dir %{_libdir}/xine/plugins/*/
+%{_libdir}/xine/plugins/*/mime.types
 # Listing every plugin separately for better control over binary packages
 # containing exactly the plugins we want, nothing accidentally snuck in
 # nor dropped.
-%dir %{_libdir}/xine/plugins/%{version}/post/
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_audio_filters.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_goom.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_mosaico.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_switch.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_visualizations.so
+%dir %{_libdir}/xine/plugins/*/post/
+%{_libdir}/xine/plugins/*/post/xineplug_post_audio_filters.so
+%{_libdir}/xine/plugins/*/post/xineplug_post_goom.so
+%{_libdir}/xine/plugins/*/post/xineplug_post_mosaico.so
+%{_libdir}/xine/plugins/*/post/xineplug_post_switch.so
+%{_libdir}/xine/plugins/*/post/xineplug_post_visualizations.so
 %if %{have_vidix}
-%dir %{_libdir}/xine/plugins/%{version}/vidix/
-%{_libdir}/xine/plugins/%{version}/vidix/cyberblade_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mach64_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mga_crtc2_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mga_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/nvidia_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/pm2_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/pm3_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/radeon_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/rage128_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
+%dir %{_libdir}/xine/plugins/*/vidix/
+%{_libdir}/xine/plugins/*/vidix/cyberblade_vid.so
+%{_libdir}/xine/plugins/*/vidix/mach64_vid.so
+%{_libdir}/xine/plugins/*/vidix/mga_crtc2_vid.so
+%{_libdir}/xine/plugins/*/vidix/mga_vid.so
+%{_libdir}/xine/plugins/*/vidix/nvidia_vid.so
+%{_libdir}/xine/plugins/*/vidix/pm2_vid.so
+%{_libdir}/xine/plugins/*/vidix/pm3_vid.so
+%{_libdir}/xine/plugins/*/vidix/radeon_vid.so
+%{_libdir}/xine/plugins/*/vidix/rage128_vid.so
+%{_libdir}/xine/plugins/*/vidix/savage_vid.so
+%{_libdir}/xine/plugins/*/vidix/sis_vid.so
+%{_libdir}/xine/plugins/*/vidix/unichrome_vid.so
 %endif # vidix
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_gsm610.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_alsa.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_file.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_none.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/*/xineplug_decode_bitplane.so
+%{_libdir}/xine/plugins/*/xineplug_decode_gsm610.so
+%{_libdir}/xine/plugins/*/xineplug_decode_lpcm.so
+%{_libdir}/xine/plugins/*/xineplug_decode_mpc.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
+%{_libdir}/xine/plugins/*/xineplug_decode_qt.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
+%{_libdir}/xine/plugins/*/xineplug_decode_real.so
+%{_libdir}/xine/plugins/*/xineplug_decode_rgb.so
+%{_libdir}/xine/plugins/*/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/*/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/*/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/*/xineplug_decode_spucmml.so
+%{_libdir}/xine/plugins/*/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/*/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/*/xineplug_decode_theora.so
+%{_libdir}/xine/plugins/*/xineplug_decode_vorbis.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
+%{_libdir}/xine/plugins/*/xineplug_decode_w32dll.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so
-%{_libdir}/xine/plugins/%{version}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
+%{_libdir}/xine/plugins/*/xineplug_decode_yuv.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_audio.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_avi.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_fli.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_flv.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_games.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_iff.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_image.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_matroska.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_nsv.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_ogg.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_pva.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_qt.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_rawdv.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_real.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_slave.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_sputext.so
+%{_libdir}/xine/plugins/*/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/*/xineplug_flac.so
+%{_libdir}/xine/plugins/*/xineplug_inp_cdda.so
+%{_libdir}/xine/plugins/*/xineplug_inp_dvb.so
+%{_libdir}/xine/plugins/*/xineplug_inp_file.so
+%{_libdir}/xine/plugins/*/xineplug_inp_http.so
+%{_libdir}/xine/plugins/*/xineplug_inp_net.so
+%{_libdir}/xine/plugins/*/xineplug_inp_pnm.so
+%{_libdir}/xine/plugins/*/xineplug_inp_pvr.so
+%{_libdir}/xine/plugins/*/xineplug_inp_rtp.so
+%{_libdir}/xine/plugins/*/xineplug_inp_rtsp.so
+%{_libdir}/xine/plugins/*/xineplug_inp_stdin_fifo.so
+%{_libdir}/xine/plugins/*/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_fb.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_none.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_vidix.so
 %endif # vidix
 %if %{with_xcb}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_xcbxv.so
 %endif # xcb
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_xshm.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_xv.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_xvmc.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_xxmc.so
 %if %{with_wpack}
-%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
+%{_libdir}/xine/plugins/*/xineplug_wavpack.so
 %endif # wpack
 
 %files arts
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_arts.so
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_esd.so
 %if %{with_jack}
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_jack.so
 %endif # jack
 %if %{with_pa}
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
+%{_libdir}/xine/plugins/*/xineplug_ao_out_pulseaudio.so
 %endif # pa
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
+%{_libdir}/xine/plugins/*/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
+%{_libdir}/xine/plugins/*/xineplug_decode_image.so
 %endif # imagemagick
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%{_libdir}/xine/plugins/*/xineplug_inp_gnome_vfs.so
+%{_libdir}/xine/plugins/*/xineplug_inp_smb.so
 %if %{with_aalib}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_aa.so
 %endif # aalib
 %if %{with_caca}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_xdirectfb.so
 %endif # directfb
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_sdl.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -384,6 +385,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb  8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1
+- 1.1.10.1 (security update, #431541).
+
+* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
+- Include spu, spucc, and spucmml decoders (#213597).
+
 * Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
 - 1.1.10 (security update).