diff --git a/audacious-plugins-1.5.1-jack.patch b/audacious-plugins-1.5.1-jack.patch
new file mode 100644
index 0000000..2648a84
--- /dev/null
+++ b/audacious-plugins-1.5.1-jack.patch
@@ -0,0 +1,21 @@
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c
+--- audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c	2008-06-08 10:37:44.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c	2009-12-03 00:45:31.956608364 +0100
+@@ -219,7 +219,7 @@
+ 
+ 
+ /* Return the amount of data that can be written to the device */
+-gint jack_free(void)
++gint audacious_jack_free(void)
+ {
+   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
+   unsigned long tmp;
+@@ -479,7 +479,7 @@
+ 	.close_audio = jack_close,
+ 	.flush = jack_flush,
+ 	.pause = jack_pause,
+-	.buffer_free = jack_free,
++	.buffer_free = audacious_jack_free,
+ 	.buffer_playing = jack_playing,
+ 	.output_time = jack_get_output_time,
+ 	.written_time = jack_get_written_time,
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index d92c897..e3b0b55 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -32,6 +32,7 @@ Patch11:        audacious-plugins-1.5.1-sndfile-playfix.patch
 Patch12:        audacious-plugins-1.5.1-modplug.patch
 Patch13:        audacious-plugins-1.5.1-musepack.patch
 Patch14:        audacious-plugins-1.5.1-neon.patch
+Patch15:        audacious-plugins-1.5.1-jack.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -190,6 +191,7 @@ vortex compressed files.
 %patch12 -p1 -b .modplug
 %patch13 -p1 -b .musepack
 %patch14 -p1 -b .neon
+%patch15 -p1 -b .jack_free
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -291,6 +293,7 @@ update-desktop-database &> /dev/null || :
 %changelog
 * Thu Dec  3 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.5.1-19
 - Fix truncated track name for streaming mp3 in neon.c (#543050).
+- Merge jack_free redeclaration fix.
 
 * Tue Nov 17 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.5.1-18
 - Corrupt musepack files were able to crash Audacious.