  	if (vorbis_is_streaming) {
  		/* this is a stream */
  		vorbis_http_close();
-diff -x Makefile -x Makefile.in -ru xmms-1.2.11-original/Input/vorbis/vorbis.h xmms-1.2.11/Input/vorbis/vorbis.h
+diff -x config.h.in -x configure -x '*.m4' -x Makefile -x Makefile.in -ru xmms-1.2.11-original/Input/vorbis/vorbis.h xmms-1.2.11/Input/vorbis/vorbis.h
 --- xmms-1.2.11-original/Input/vorbis/vorbis.h	2004-04-04 09:51:20.000000000 +0100
 +++ xmms-1.2.11/Input/vorbis/vorbis.h	2008-07-16 14:03:37.000000000 +0100
 @@ -21,6 +21,8 @@

+                *category = g_strdup(k.ki->category);
+                *language = g_strdup(k.ki->language);
+#if (KATE_VERSION_MAJOR*0x10000) + (KATE_VERSION_MINOR*0x100) + KATE_VERSION_PATCH >= 0x000106
+                kc = kate_high_decode_get_comments(&k);
+                *vendor = g_strdup(kc->vendor);
+#endif

 		gtk_widget_show_all(window);
 	} else
 		gdk_window_raise(window->window);
@@ -813,10 +926,55 @@
 	gtk_label_set_text(GTK_LABEL(filesize_label), "");
 	gtk_label_set_text(GTK_LABEL(vendor_label), "");
 
