  SOURCES_fluidsynth = fluidsynth.c
  SOURCES_cc = cc.c cc.h
 +SOURCES_kate = kate.c
-diff -urN vlc-original/modules/codec/kate.c vlc/modules/codec/kate.c
+diff -x '*.o' -x '*.lo' -x '*.la' -x '*.loT' -x '*.Po' -x .deps -x .libs -x autom4te.cache -x Makefile -x Makefile.in -x configure -x config.log -x config.status -x config.guess -x config.sub -x aclocal.m4 -x config.rpath -x .svn -x .depend -x libtool -x ltmain.sh -x depcomp -x missing -x compile -x install-sh -x POTFILES -x stamp-h1 -x activex -x m4 -x vlc-config -x vlc-config.in -x vlc.win32.nsi -x config.h -x ffmpeg -x modules_builtin.h -x builtin.h -x version.c -x revision.c -x config.h.in -x Makefile.am -x '*.po' -x po -x '*.pc' -x '*~' -x '*.rej' -x ABOUT-NLS -x cvlc -x svlc -x rvlc -x vlc_about.h -x vlc_threads_funcs.h -urN vlc-original/modules/codec/kate.c vlc/modules/codec/kate.c
 --- vlc-original/modules/codec/kate.c	1970-01-01 01:00:00.000000000 +0100
-+++ vlc/modules/codec/kate.c	2008-03-22 20:40:15.000000000 +0000
-@@ -0,0 +1,580 @@
++++ vlc/modules/codec/kate.c	2008-04-06 12:27:13.000000000 +0100
+@@ -0,0 +1,647 @@
 +/*****************************************************************************
 + * kate.c : a decoder for the kate bitstream format
 + *****************************************************************************

diff -urN vlc-original/configure.ac vlc/configure.ac
--- vlc-original/configure.ac	2008-03-21 13:55:57.000000000 +0000
+++ vlc/configure.ac	2008-03-22 20:47:34.000000000 +0000
@@ -3881,6 +3881,32 @@

         else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) )
         {
             tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
diff -x '*.o' -x '*.lo' -x '*.la' -x '*.loT' -x '*.Po' -x .deps -x .libs -x autom4te.cache -x Makefile -x Makefile.in -x configure -x config.log -x config.status -x config.guess -x config.sub -x aclocal.m4 -x config.rpath -x .svn -x .depend -x libtool -x ltmain.sh -x depcomp -x missing -x compile -x install-sh -x POTFILES -x stamp-h1 -x activex -x m4 -x vlc-config -x vlc-config.in -x vlc.win32.nsi -x config.h -x ffmpeg -x modules_builtin.h -x builtin.h -x version.c -x revision.c -x config.h.in -x Makefile.am -x '*.po' -x po -x '*.pc' -x '*~' -x '*.rej' -x ABOUT-NLS -x cvlc -x svlc -x rvlc -x vlc_about.h -x vlc_threads_funcs.h -urN vlc-original/modules/demux/ogg.c vlc/modules/demux/ogg.c
--- vlc-original/modules/demux/ogg.c	2008-03-17 13:44:23.000000000 +0000
+++ vlc/modules/demux/ogg.c	2008-03-21 23:30:01.000000000 +0000
@@ -85,7 +85,10 @@
