diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/configure.c audacious-plugin-fc-0.6-aud40/src/configure.c
--- audacious-plugin-fc-0.6-aud38/src/configure.c	2012-06-18 14:08:35.138165744 +0200
+++ audacious-plugin-fc-0.6-aud40/src/configure.c	2012-06-18 14:01:54.000000000 +0200
@@ -134,11 +134,8 @@
 };
 
 PluginPreferences fc_ip_preferences = {
-    .domain = "fc14audiodecoder",
-    .title = "Future Composer Decoder Configuration",
-    .prefs = prefs,
-    .n_prefs = G_N_ELEMENTS(prefs),
-    .type = PREFERENCES_WINDOW,
+    .widgets = prefs,
+    .n_widgets = G_N_ELEMENTS(prefs),
     .init = configure_init,
     .apply = configure_apply,
 };
diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/main.c audacious-plugin-fc-0.6-aud40/src/main.c
--- audacious-plugin-fc-0.6-aud38/src/main.c	2012-06-18 14:08:33.203270001 +0200
+++ audacious-plugin-fc-0.6-aud40/src/main.c	2012-06-18 14:05:11.000000000 +0200
@@ -205,9 +205,6 @@
             if ( fc14dec_song_end(decoder) && jumpToTime<0 ) {
                 stop_flag = TRUE;
  DRAIN:
-                while ( !stop_flag && playback->output->buffer_playing() ) {
-                    g_usleep(20000);
-                }
                 break;
             }
         }
@@ -217,7 +214,6 @@
     g_cond_signal(seek_cond);  /* wake up any waiting request */
     g_mutex_unlock(seek_mutex);
 
-    playback->output->close_audio();
     g_free(sampleBuf);
     fc14dec_delete(decoder);
     return TRUE;
diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/plugin.c audacious-plugin-fc-0.6-aud40/src/plugin.c
--- audacious-plugin-fc-0.6-aud38/src/plugin.c	2012-06-18 14:08:35.140165668 +0200
+++ audacious-plugin-fc-0.6-aud40/src/plugin.c	2012-06-18 14:07:40.000000000 +0200
@@ -22,7 +22,7 @@
     .name = "Future Composer decoder",
     .init = ip_init,
     .about = fc_ip_about,
-    .settings = &fc_ip_preferences,
+    .prefs = &fc_ip_preferences,
     .have_subtune = FALSE,
     .extensions = fc_fmts,
     .play = ip_play,