diff --git a/audacious-plugins-2.1-modplug.patch b/audacious-plugins-2.1-modplug.patch
new file mode 100644
index 0000000..5703a8c
--- /dev/null
+++ b/audacious-plugins-2.1-modplug.patch
@@ -0,0 +1,55 @@
+diff -Nur audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.cxx audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.cxx
+--- audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.cxx	2009-07-07 00:40:36.000000000 +0200
++++ audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.cxx	2009-10-25 12:21:52.524068282 +0100
+@@ -295,15 +295,6 @@
+ 		if(mStopped)
+ 			break;
+ 	
+-		//wait for buffer space to free up.
+-		while(((mOutPlug->buffer_free()
+-		    < (int)mBufSize))
+-		   && (!mStopped))
+-			usleep(10000);
+-			
+-		if(mStopped)
+-			break;
+-		
+ 		playback->pass_audio
+ 		(
+ 			playback,
+@@ -451,8 +442,6 @@
+ 		mModProps.mChannels
+ 	);
+ 
+-	mDecodeThread = g_thread_self();
+-
+ 	ipb->playing = TRUE;
+ 	ipb->set_pb_ready(ipb);
+ 	this->PlayLoop(ipb);
+@@ -466,8 +455,6 @@
+ 
+ 	mStopped = true;
+ 	mPaused = false;
+-	
+-	g_thread_join(mDecodeThread);
+ }
+ 
+ void ModplugXMMS::Pause(bool aPaused)
+diff -Nur audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.h audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.h
+--- audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.h	2009-07-07 00:40:36.000000000 +0200
++++ audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.h	2009-10-25 12:20:58.578071107 +0100
+@@ -121,14 +121,11 @@
+ 
+ 	uint32      mPlayed;
+ 
+-	GThread*    mDecodeThread;
+-
+ 	char        mModName[100];
+ 	
+ 	float mPreampFactor;
+ 
+ 	void PlayLoop(InputPlayback *);
+-	static void* PlayThread(void* arg);
+ 	const char* Bool2OnOff(bool aValue);
+ };
+ 
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index a299bc8..d0c2b47 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -28,6 +28,7 @@ Patch3: audacious-plugins-2.1-alsa-ng.patch
 Patch4: audacious-plugins-2.1-underruns.patch
 Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
 Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
+Patch7: audacious-plugins-2.1-modplug.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -154,6 +155,7 @@ vortex compressed files.
 %patch4 -p1 -b .underruns
 %patch5 -p1 -b .pulseaudio-volume
 %patch6 -p1 -b .pulseaudio-volume-accuracy
+%patch7 -p1 -b .modplug
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -237,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-8
+- Patch modplug plugin to remove old cruft and fix playback.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-7
 - Patch pulseaudio plugin to not suffer from precision loss when
   calculating the volume level to save.