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.spec b/audacious-plugins.spec
index c881985..d3edf7e 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 27%{?dist}
+Release: 28%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -65,6 +65,8 @@ 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
@@ -214,6 +216,7 @@ in Vortex (.vtx) format.
 %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
@@ -314,6 +317,10 @@ 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).