diff --git a/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp b/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
index af20132150..ea2005f763 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
@@ -203,7 +203,8 @@ RageSound_OSS::RageSound_OSS()
 	if(ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &i) == -1)
 		RageException::ThrowNonfatal("RageSound_OSS: ioctl(SNDCTL_DSP_SETFRAGMENT, %i): %s", i, strerror(errno));
 
-	MixerThreadPtr = SDL_CreateThread(MixerThread_start, this);
+	MixingThread.SetName( "RageSound_OSS" );
+	MixingThread.Create( MixerThread_start, this );
 }
 
 
@@ -212,7 +213,7 @@ RageSound_OSS::~RageSound_OSS()
 	/* Signal the mixing thread to quit. */
 	shutdown = true;
 	LOG->Trace("Shutting down mixer thread ...");
-	SDL_WaitThread(MixerThreadPtr, NULL);
+	MixingThread.Wait();
 	LOG->Trace("Mixer thread shut down.");
 
 	close(fd);
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
index fcc13969d3..7f9a66e734 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
@@ -2,7 +2,7 @@
 #define RAGE_SOUND_WAVEOUT
 
 #include "RageSoundDriver.h"
-#include "SDL_thread.h"
+#include "RageThreads.h"
 
 class RageSound_OSS: public RageSoundDriver
 {
@@ -27,7 +27,7 @@ class RageSound_OSS: public RageSoundDriver
 
 	static int MixerThread_start(void *p);
 	void MixerThread();
-	SDL_Thread *MixerThreadPtr;
+	RageThread MixingThread;
 
 public:
 	bool GetData();