diff --git a/client/Makefile b/client/Makefile
index e57b47bc..7f18a9c9 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,6 +1,6 @@
 VERSION = 0.01
 CC      = /usr/bin/g++
-CFLAGS  = -std=gnu++0x -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
+CFLAGS  = -std=gnu++0x -static-libgcc -static-libstdc++ -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
 LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc
 
 OBJ = snapClient.o stream.o alsaPlayer.o clientConnection.o timeProvider.o oggDecoder.o pcmDecoder.o controller.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
diff --git a/client/stream.cpp b/client/stream.cpp
index 1c7a4110..89b8a96a 100644
--- a/client/stream.cpp
+++ b/client/stream.cpp
@@ -302,9 +302,9 @@ if (since.count() > 0)
 		else if (shortBuffer.full())
 		{
 			if (chronos::usec(shortMedian) > chronos::usec(100))
-				setRealSampleRate(format.rate * 0.99999);
+				setRealSampleRate(format.rate * 0.9999);
 			else if (chronos::usec(shortMedian) < -chronos::usec(100))
-				setRealSampleRate(format.rate * 1.00001);
+				setRealSampleRate(format.rate * 1.0001);
 		}
 
 		updateBuffers(age.count());