diff --git a/audacious-plugins-2.2-amidi.patch b/audacious-plugins-2.2-amidi.patch
new file mode 100644
index 0000000..ed0a417
--- /dev/null
+++ b/audacious-plugins-2.2-amidi.patch
@@ -0,0 +1,16 @@
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c
+--- audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c	2010-03-16 10:41:24.000000000 +0100
+@@ -659,8 +659,10 @@
+   /* IMPORTANT
+      this couple of important values is set by i_midi_set_length */
+   mf->length = length_microsec;
+-  mf->avg_microsec_per_tick = (gint)(length_microsec / mf->max_tick);
+-
++  if (mf->max_tick)
++      mf->avg_microsec_per_tick = (gint)(length_microsec / mf->max_tick);
++  else
++      mf->avg_microsec_per_tick = 1;  /* dummy - protect against div-by-zero */
+   return;
+ }
+ 
diff --git a/audacious-plugins-2.2-no-adplugdb.patch b/audacious-plugins-2.2-no-adplugdb.patch
new file mode 100644
index 0000000..8d71aa4
--- /dev/null
+++ b/audacious-plugins-2.2-no-adplugdb.patch
@@ -0,0 +1,14 @@
+diff -Nur audacious-plugins-2.2-orig/src/adplug/adplug-xmms.cc audacious-plugins-2.2/src/adplug/adplug-xmms.cc
+--- audacious-plugins-2.2-orig/src/adplug/adplug-xmms.cc	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2/src/adplug/adplug-xmms.cc	2010-03-13 19:29:06.000000000 +0100
+@@ -1043,8 +1043,10 @@
+     {
+       std::string userdb;
+       userdb = "file://" + std::string(g_get_home_dir()) + "/" ADPLUG_CONFDIR "/" + ADPLUGDB_FILE;
++      if (aud_vfs_file_test(userdb.c_str(),G_FILE_TEST_EXISTS)) {
+       plr.db->load (userdb);    // load user's database
+       dbg_printf (" (userdb=\"%s\")", userdb.c_str());
++      }
+     }
+   }
+   CAdPlug::set_database (plr.db);
diff --git a/audacious-plugins-2.2-playlist-font-safety.patch b/audacious-plugins-2.2-playlist-font-safety.patch
new file mode 100644
index 0000000..df4adad
--- /dev/null
+++ b/audacious-plugins-2.2-playlist-font-safety.patch
@@ -0,0 +1,12 @@
+diff -Nur audacious-plugins-2.2-orig/src/skins/skins_cfg.c audacious-plugins-2.2/src/skins/skins_cfg.c
+--- audacious-plugins-2.2-orig/src/skins/skins_cfg.c	2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-2.2/src/skins/skins_cfg.c	2010-03-13 19:57:52.000000000 +0100
+@@ -233,7 +233,7 @@
+     if (!config.mainwin_font)
+         config.mainwin_font = g_strdup(MAINWIN_DEFAULT_FONT);
+ 
+-    if (!config.playlist_font)
++    if (!config.playlist_font || !strchr(config.playlist_font,' '))
+         config.playlist_font = g_strdup(PLAYLISTWIN_DEFAULT_FONT);
+ 
+     if (!aud_cfg_db_get_float(cfgfile, "skins", "scale_factor", &(config.scale_factor)))
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index f044d95..d3edf7e 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 25%{?dist}
+Release: 28%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -59,8 +59,14 @@ Patch14: audacious-plugins-2.2-tmp-vuln.patch
 Patch15: audacious-plugins-2.2-streambrowser-url-add.patch
 #
 Patch16: audacious-plugins-2.2-scrobbler.patch
-#
+# merged upstream with additional patch for 2.3: AUDPLUG-170
 Patch17: audacious-plugins-2.2-status.patch
+#
+Patch18: audacious-plugins-2.2-no-adplugdb.patch
+# is this even possible? bz 573075
+Patch19: audacious-plugins-2.2-playlist-font-safety.patch
+# div-by-zero with almost empty MIDI file, bz 573851
+Patch20: audacious-plugins-2.2-amidi.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -208,6 +214,9 @@ in Vortex (.vtx) format.
 %patch15 -p1 -b .streambrowser-url-add
 %patch16 -p1 -b .scrobbler
 %patch17 -p1 -b .status
+%patch18 -p1 -b .no-adplugdb
+%patch19 -p1 -b .playlist-font-safety
+%patch20 -p1 -b .amidi
 
 for i in src/ladspa/ladspa.c
 do
@@ -308,6 +317,16 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Tue Mar 16 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-28
+- Avoid div-by-zero crash due to almost empty MIDI files, which
+  don't contain any delta-time events (#573851).
+
+* Sat Mar 13 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-27
+- Don't accept playlist_font name without space(s) (#573075). 
+
+* Sat Mar 13 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-26
+- Don't warn on stderr about missing adplug.db (#573187).
+
 * Thu Mar  4 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-25
 - Update icon popup patch for new playlist API to also fix a double-free
   (which made the popup crash with streaming audio).