--- src/SConscript.orig	2010-04-12 20:42:58.000000000 -0700
+++ src/SConscript	2010-04-12 20:49:04.000000000 -0700
@@ -737,9 +737,6 @@
 else:
 	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
 	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
-	if platform != 'osx':
-		env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
-	env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
 	env.Append(CPPDEFINES = "_REENTRANT")
 
 #Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
@@ -772,29 +769,9 @@
 
 #SoundTouch
 #XXX this should be done with a subsconscript
-env.Append(CPPPATH=['#lib/soundtouch-1.4.1'])
-sources += Split("""engine/enginebufferscalest.cpp
-                    #lib/soundtouch-1.4.1/SoundTouch.cpp
-                    #lib/soundtouch-1.4.1/TDStretch.cpp
-                    #lib/soundtouch-1.4.1/RateTransposer.cpp
-                    #lib/soundtouch-1.4.1/AAFilter.cpp
-                    #lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp
-                    #lib/soundtouch-1.4.1/FIRFilter.cpp
-                    #lib/soundtouch-1.4.1/PeakFinder.cpp
-                    #lib/soundtouch-1.4.1/BPMDetect.cpp
-                    """)
-
-if 'win' in platform:
-	if platform == 'win32':
-		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp""")
-	if platform == 'win64':
-		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp""")
-else:
-	if machine == 'x86_64':
-		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp""")
-	else:
-		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp""")
-
+sources += Split("""engine/enginebufferscalest.cpp""")
+env.Append(CPPPATH = [ ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch' ])
+env.Append(LIBS = 'SoundTouch')
 
 #KissFFT
 env.Append(CPPPATH=['#lib/kissfft'])