  LIBBEEP_MAJOR_VERSION ?= @LIBBEEP_MAJOR_VERSION@
 diff -ru audacious-plugins-be718ff506c0/src/vorbis/configure.c ../audacious-plugins-be718ff506c0/src/vorbis/configure.c
 --- audacious-plugins-be718ff506c0/src/vorbis/configure.c	2008-07-18 10:10:11.000000000 +0100
-+++ ../audacious-plugins-be718ff506c0/src/vorbis/configure.c	2008-07-24 08:11:47.000000000 +0100
-@@ -17,6 +17,13 @@
++++ ../audacious-plugins-be718ff506c0/src/vorbis/configure.c	2008-07-24 17:58:43.000000000 +0100
+@@ -17,6 +17,14 @@
  
  static GtkWidget *title_tag_override, *title_tag_box, *title_tag_entry,
      *title_desc;

     GtkWidget *bbox, *ok, *cancel;
 
     if (vorbis_configurewin != NULL) {
@@ -120,6 +162,54 @@
 
     gtk_box_pack_start(GTK_BOX(vbox), title_frame, TRUE, TRUE, 0);
 

 	int               eosin;
 } vcedit_state;
 
diff -ru audacious-plugins-be718ff506c0/src/vorbis/vcupdate.c ../audacious-plugins-be718ff506c0/src/vorbis/vcupdate.c
--- audacious-plugins-be718ff506c0/src/vorbis/vcupdate.c	2008-07-18 10:10:11.000000000 +0100
+++ ../audacious-plugins-be718ff506c0/src/vorbis/vcupdate.c	2008-07-24 18:01:27.000000000 +0100
@@ -43,6 +43,7 @@
 static gboolean write_and_pivot_files(vcedit_state * state);
 
 extern GMutex *vf_mutex;
+extern GMutex *kate_mutex;
 
 static mowgli_dictionary_t *
 dictionary_from_vorbis_comment(vorbis_comment * vc)
@@ -127,11 +128,13 @@
     if(!tuple || !fd) return FALSE;
     
     g_mutex_lock(vf_mutex);
+    g_mutex_lock(kate_mutex);
 
     state = vcedit_new_state();
 
     if(vcedit_open(state, fd) < 0) {
         vcedit_clear(state);
+        g_mutex_unlock(kate_mutex);
         g_mutex_unlock(vf_mutex);
         return FALSE;
     }
@@ -154,6 +157,7 @@
     ret = write_and_pivot_files(state);
 
     vcedit_clear(state);
+    g_mutex_unlock(kate_mutex);
     g_mutex_unlock(vf_mutex);
 
     return ret;
diff -ru audacious-plugins-be718ff506c0/src/vorbis/vorbis.c ../audacious-plugins-be718ff506c0/src/vorbis/vorbis.c
--- audacious-plugins-be718ff506c0/src/vorbis/vorbis.c	2008-07-18 10:10:11.000000000 +0100
+++ ../audacious-plugins-be718ff506c0/src/vorbis/vorbis.c	2008-07-24 08:07:38.000000000 +0100
