  	int eosin;
  } vcedit_state;
  
-diff -x config.h.in -x configure -x '*.m4' -x Makefile -x Makefile.in -ru xmms-1.2.11-original/Input/vorbis/vorbis.c xmms-1.2.11/Input/vorbis/vorbis.c
+diff -x config.h.in -x configure -x aclocal.m4 -x Makefile -x Makefile.in -ru xmms-1.2.11-original/Input/vorbis/vorbis.c xmms-1.2.11/Input/vorbis/vorbis.c
 --- xmms-1.2.11-original/Input/vorbis/vorbis.c	2006-07-16 14:40:04.000000000 +0100
-+++ xmms-1.2.11/Input/vorbis/vorbis.c	2008-10-21 20:43:07.000000000 +0100
++++ xmms-1.2.11/Input/vorbis/vorbis.c	2008-10-25 20:52:07.000000000 +0100
 @@ -42,6 +42,9 @@
  #include <ogg/ogg.h>
  #include <vorbis/codec.h>

 @LTLIBICONV@
 
 libvorbis_la_SOURCES = \
diff -x config.h.in -x configure -x '*.m4' -x Makefile -x Makefile.in -ru xmms-1.2.11-original/Input/vorbis/configure.c xmms-1.2.11/Input/vorbis/configure.c
--- xmms-1.2.11-original/Input/vorbis/configure.c	2005-05-15 01:01:20.000000000 +0100
+++ xmms-1.2.11/Input/vorbis/configure.c	2008-07-16 14:20:27.000000000 +0100
@@ -29,6 +29,8 @@
 static GtkWidget *streaming_save_dirbrowser, *streaming_save_hbox;
 static GtkWidget *title_tag_override, *title_tag_box, *title_tag_entry, *title_desc;
 static GtkWidget *rg_switch, *rg_clip_switch, *rg_booster_switch, *rg_track_gain;
+static GtkWidget *kate_lyrics;
+static GtkWidget *kate_offset_spin;
 
 vorbis_config_t vorbis_cfg;
 
@@ -80,6 +82,8 @@
 	else
 		vorbis_cfg.replaygain_mode = REPLAYGAIN_MODE_ALBUM;
 
+	vorbis_cfg.show_kate_lyrics = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(kate_lyrics));
+	vorbis_cfg.kate_offset = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(kate_offset_spin));
 	
 	cfg = xmms_cfg_open_default_file();
 
@@ -117,6 +121,8 @@
 	xmms_cfg_write_boolean(cfg, "vorbis", "use_replaygain", vorbis_cfg.use_replaygain);
 	xmms_cfg_write_int(cfg, "vorbis", "replaygain_mode", vorbis_cfg.replaygain_mode);
 	xmms_cfg_write_boolean(cfg, "vorbis", "use_booster", vorbis_cfg.use_booster);
+	xmms_cfg_write_boolean(cfg, "vorbis", "show_kate_lyrics", vorbis_cfg.show_kate_lyrics);
+	xmms_cfg_write_int(cfg, "vorbis", "kate_offset", vorbis_cfg.kate_offset);
 	xmms_cfg_write_default_file(cfg);
 	xmms_cfg_free(cfg);
 	gtk_widget_destroy(vorbis_configurewin);
@@ -211,6 +217,11 @@
 	GtkWidget *bbox, *ok, *cancel;
 	GtkWidget *rg_type_frame, *rg_type_vbox, *rg_album_gain;
 	GtkObject *streaming_size_adj, *streaming_pre_adj;

 		if (ov_open(fh, &vf, NULL, 0) == 0)
 		{
 			comment = ov_comment(&vf, -1);
diff -x config.h.in -x configure -x aclocal.m4 -x Makefile -x Makefile.in -ru xmms-1.2.11-original/Input/vorbis/vcedit.c xmms-1.2.11/Input/vorbis/vcedit.c
--- xmms-1.2.11-original/Input/vorbis/vcedit.c	2001-12-17 22:27:19.000000000 +0000
+++ xmms-1.2.11/Input/vorbis/vcedit.c	2008-10-21 20:38:37.000000000 +0100
@@ -141,6 +141,39 @@
