  LIBS=$(GTK_LIB) $(XMMS2_LIB)
  
  KRELLLFLAGS=-shared
+diff -ru gxmms2-0.7.0/README gxmms2-0.7.0-with-lyrics/README
+--- gxmms2-0.7.0/README	2007-03-24 19:34:59.000000000 +0000
++++ gxmms2-0.7.0-with-lyrics/README	2008-10-25 15:25:08.000000000 +0100
+@@ -85,6 +85,7 @@
+ - b for next track
+ - j for medialib/playlist window
+ - t for toggle elapsed/remaining time
++- l for toggle lyrics display
+ - +/- to increase/decrease the volume
+ - 0..4 to rate the current track where 0 is worst and 4 is best
+ 

 	gtk_widget_show_all(window);
 
 	connection = xmmsc_init("gxmms2");
@@ -1191,6 +1284,7 @@
 		}
 	}
 	cfg_add_key(&cf, "ShowRemainingTime", (flag_time_remaining ? "yes" : "no"));

 			case GDK_0:
 				rate_current_track(1);
 				break;
@@ -419,6 +502,9 @@
 		xmms2ctrl_get_error() != ERROR_CONNECTION) {
 		xmmsc_result_t *res2;
 
+		/* ensure we don't end up with stale lyrics when changing track */
+		strcpy (current_lyrics, "");
+
 		res2 = xmmsc_medialib_get_info(connection, current_id);
 		xmmsc_result_notifier_set(res2, n_media_lib_get_info, &current_id);
 		xmmsc_result_unref(res2);
@@ -431,6 +517,9 @@
 		xmms2ctrl_get_error() != ERROR_CONNECTION) {
 		xmmsc_result_t *res2;
 
+		/* ensure we don't end up with stale lyrics when changing track */
+		strcpy (current_lyrics, "");
+
 		res2 = xmmsc_medialib_get_info(connection, current_id);
 		xmmsc_result_notifier_set(res2, n_media_lib_get_info, &current_id);
 		xmmsc_result_unref(res2);
@@ -589,6 +678,8 @@
 		                  bc_handle_playback_status_change, NULL);
 		XMMS_CALLBACK_SET(connection, xmmsc_broadcast_playback_volume_changed,
 		                  bc_handle_volume_change, NULL);
