diff --git a/xmp-2.7.1-audacious-api.patch b/xmp-2.7.1-audacious-api.patch
new file mode 100644
index 0000000..9100cd6
--- /dev/null
+++ b/xmp-2.7.1-audacious-api.patch
@@ -0,0 +1,13 @@
+diff -Nur xmp-2.7.1-orig/src/plugin/audacious.c xmp-2.7.1/src/plugin/audacious.c
+--- xmp-2.7.1-orig/src/plugin/audacious.c	2009-07-18 00:43:41.000000000 +0200
++++ xmp-2.7.1/src/plugin/audacious.c	2009-12-31 12:53:21.000000000 +0100
+@@ -118,7 +118,9 @@
+ 	.pause		= mod_pause,
+ 	.seek		= seek,
+ 	.get_time	= get_time,
++#if __AUDACIOUS_PLUGIN_API__ < 12
+ 	.get_song_info	= get_song_info,
++#endif
+ 	.cleanup	= cleanup,
+ #if __AUDACIOUS_PLUGIN_API__ >= 2
+ 	.get_song_tuple	= get_song_tuple,
diff --git a/xmp-2.7.1-audacious-dialogs.patch b/xmp-2.7.1-audacious-dialogs.patch
new file mode 100644
index 0000000..7ae66af
--- /dev/null
+++ b/xmp-2.7.1-audacious-dialogs.patch
@@ -0,0 +1,20 @@
+diff -Nur xmp-2.7.1-orig/src/plugin/audacious.c xmp-2.7.1/src/plugin/audacious.c
+--- xmp-2.7.1-orig/src/plugin/audacious.c	2009-07-18 00:43:41.000000000 +0200
++++ xmp-2.7.1/src/plugin/audacious.c	2009-10-29 13:43:15.000000000 +0100
+@@ -179,6 +179,7 @@
+ 	}
+ 
+ 	about_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
++    gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
+ 	gtk_object_set_data(GTK_OBJECT(about_window),
+ 		"about_window", about_window);
+ 	gtk_window_set_title(GTK_WINDOW(about_window),"About the XMP Plugin");
+@@ -630,7 +631,7 @@
+ 	}
+ 
+ 	xmp_conf_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+-
++    gtk_window_set_type_hint(GTK_WINDOW(xmp_conf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
+ 	gtk_object_set_data(GTK_OBJECT(xmp_conf_window),
+ 		"xmp_conf_window", xmp_conf_window);
+ 	gtk_window_set_title(GTK_WINDOW(xmp_conf_window), "XMP Configuration");
diff --git a/xmp.spec b/xmp.spec
index 067a8ad..a4bf5d3 100644
--- a/xmp.spec
+++ b/xmp.spec
@@ -3,7 +3,7 @@
 
 Name: xmp
 Version: 2.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -12,6 +12,10 @@ Source: http://rathann.fedorapeople.org/src/xmp/%{name}-%{version}-free.tar.gz
 # run this to get the above tarball
 Source1: mktarball.sh
 Patch0: %{name}-nostrip.patch
+# obsolete with XMP version upgrade
+Patch1: xmp-2.7.1-audacious-api.patch
+# merged upstream
+Patch2: xmp-2.7.1-audacious-dialogs.patch
 License: GPLv2+
 URL: http://xmp.sourceforge.net/
 Buildrequires: alsa-lib-devel
@@ -55,6 +59,8 @@ This package contains the xmp plugin for XMMS.
 %prep
 %setup -q
 %patch0 -p1 -b .nostrip
+%patch1 -p1 -b .audacious-dialogs
+%patch2 -p1 -b .audacious-api
 pushd docs
 for file in ChangeLog CREDITS ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file
@@ -92,6 +98,10 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Thu Dec 31 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.7.1-2
+- fix FTBFS (#539061), Audacious 2.2 iplugin API change
+- fix Audacious plugin dialogs
+
 * Mon Sep 14 2009 Dominik Mierzejewski <rpm@greysector.net> 2.7.1-1
 - updated to 2.7.1
 - dropped obsolete patch