diff --git a/audacious-2.2-disabled-iplugins.patch b/audacious-2.2-disabled-iplugins.patch
new file mode 100644
index 0000000..2341d23
--- /dev/null
+++ b/audacious-2.2-disabled-iplugins.patch
@@ -0,0 +1,34 @@
+diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2/src/audacious/playlist-utils.c
+--- audacious-2.2-orig/src/audacious/playlist-utils.c	2009-11-22 23:43:47.000000000 +0100
++++ audacious-2.2/src/audacious/playlist-utils.c	2009-12-30 20:28:30.000000000 +0100
+@@ -288,7 +288,7 @@
+     InputPlugin * decoder = NULL;
+     gchar * temp = g_strdup (filename);
+     gchar * temp2;
+-    GList * * index;
++    GList **list_hdr, *node;
+ 
+     decoder = uri_get_plugin (temp);
+ 
+@@ -308,11 +308,17 @@
+     temp2 = g_ascii_strdown (temp2 + 1, -1);
+     g_free (temp);
+     temp = temp2;
++    list_hdr = g_hash_table_lookup (ext_hash, temp);
+ 
+-    index = g_hash_table_lookup (ext_hash, temp);
+-
+-    if (index != NULL)
+-        decoder = (* index)->data;
++    if (list_hdr != NULL) {
++        for (node = *list_hdr; node != NULL; node = g_list_next(node)) {
++            decoder = INPUT_PLUGIN(node->data);
++            if (decoder->enabled) {
++                break;
++            }
++            decoder = NULL;
++        }
++    }
+ 
+ DONE:
+      g_free (temp);
diff --git a/audacious.spec b/audacious.spec
index d633586..6900f53 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -13,6 +13,8 @@ URL: http://audacious-media-player.org/
 Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
+# not submitted upstream, code section is gone in post-2.2
+Patch0: audacious-2.2-disabled-iplugins.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,6 +72,7 @@ Files needed when building software for the Audacious media player.
 %prep
 %setup -q -n %{name}-%{version}
 sed -i '\,^.SILENT:,d' buildsys.mk.in
+%patch0 -p1 -b .disabled-iplugins
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -184,6 +187,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Dec 30 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-3
+- Patch Audacious so that filename_find_decoder only considers
+  enabled input plugins (disabled modplug plugin effectively disabled
+  also the xmp plugin).
+
 * Wed Dec  2 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-2
 - Drop Musepack and SID MIME types from desktop files. As of Audacious 2.2,
   Musepack is only supported by the separate "ffaudio" plugin. The SID