diff --git a/.gitignore b/.gitignore
index e3682777..5fe04d33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ autom4te.cache
 /ltmain.sh
 /missing
 /depcomp
+/sourcery
 .libs
 VERSION
 .dep.inc
diff --git a/Makefile b/Makefile
index 5a8c3cf6..85412e52 100644
--- a/Makefile
+++ b/Makefile
@@ -28,137 +28,137 @@ endif
 
 controller: MistController
 MistController: src/controller/server.html.h src/controller/*
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/controller/*.cpp
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) src/controller/*.cpp $(LDLIBS) -o $@
 
 buffers: MistPlayer
 MistPlayer: src/buffer/player.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 buffers: MistBuffer
 MistBuffer: LDLIBS += -lpthread
 MistBuffer: src/buffer/buffer.cpp src/buffer/buffer_stream.h src/buffer/buffer_stream.cpp tinythread.o tinythread.h
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/buffer/buffer.cpp src/buffer/buffer_stream.cpp tinythread.o
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) src/buffer/buffer.cpp src/buffer/buffer_stream.cpp tinythread.o $(LDLIBS) -o $@
 
 connectors: MistConnRaw
 MistConnRaw: src/connectors/conn_raw.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnRTMP
 MistConnRTMP: src/connectors/conn_rtmp.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTP
 MistConnHTTP: LDLIBS += -lpthread
 MistConnHTTP: src/connectors/conn_http.cpp tinythread.o tinythread.h src/connectors/embed.js.h src/connectors/icon.h
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/connectors/conn_http.cpp tinythread.o
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) src/connectors/conn_http.cpp tinythread.o $(LDLIBS) -o $@
 
 connectors: MistConnHTTPProgressiveFLV
 MistConnHTTPProgressiveFLV: src/connectors/conn_http_progressive_flv.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTPProgressiveMP3
 MistConnHTTPProgressiveMP3: src/connectors/conn_http_progressive_mp3.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTPProgressiveMP4
 MistConnHTTPProgressiveMP4: src/connectors/conn_http_progressive_mp4.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTPProgressiveOGG
 MistConnHTTPProgressiveOGG: src/connectors/conn_http_progressive_ogg.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTPDynamic
 MistConnHTTPDynamic: src/connectors/conn_http_dynamic.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTPSmooth
 MistConnHTTPSmooth: src/connectors/conn_http_smooth.cpp src/connectors/xap.h
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) src/connectors/conn_http_smooth.cpp
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $< $(LDLIBS) -o $@
 
 connectors: MistConnHTTPLive
 MistConnHTTPLive: src/connectors/conn_http_live.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTPSRT 
 MistConnHTTPSRT: src/connectors/conn_http_srt.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnHTTPJSON
 MistConnHTTPJSON: src/connectors/conn_http_json.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 connectors: MistConnTS
 MistConnTS: src/connectors/conn_ts.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 analysers: MistAnalyserRTMP
 MistAnalyserRTMP: src/analysers/rtmp_analyser.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 analysers: MistAnalyserFLV
 MistAnalyserFLV: src/analysers/flv_analyser.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 analysers: MistAnalyserDTSC
 MistAnalyserDTSC: src/analysers/dtsc_analyser.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 analysers: MistAnalyserAMF
 MistAnalyserAMF: src/analysers/amf_analyser.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 analysers: MistAnalyserMP4
 MistAnalyserMP4: src/analysers/mp4_analyser.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 analysers: MistAnalyserOGG
 MistAnalyserOGG: src/analysers/ogg_analyser.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 analysers: MistInfo
 MistInfo: src/analysers/info.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistDTSC2FLV
 MistDTSC2FLV: src/converters/dtsc2flv.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistFLV2DTSC
 MistFLV2DTSC: src/converters/flv2dtsc.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistOGG2DTSC
 MistOGG2DTSC: src/converters/ogg2dtsc.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistDTSC2OGG
 MistDTSC2OGG: src/converters/dtsc2ogg.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistDTSCFix
 MistDTSCFix: src/converters/dtscfix.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistDTSCMerge
 MistDTSCMerge: src/converters/dtscmerge.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistDTSC2TS
 MistDTSC2TS: src/converters/dtsc2ts.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistSRT2DTSC
 MistSRT2DTSC: src/converters/srt2dtsc.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistDTSC2SRT
 MistDTSC2SRT: src/converters/dtsc2srt.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 converters: MistDTSC2MP4
 MistDTSC2MP4: src/converters/dtsc2mp4.cpp
-	$(CXX) -o $@ $(LDLIBS) $(CPPFLAGS) $^
+	$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
 
 BUILT_SOURCES=controller/server.html.h connectors/embed.js.h
 lspSOURCES=lsp/jquery.js lsp/placeholder.js lsp/md5.js lsp/main.js lsp/pages.js lsp/tablesort.js
@@ -196,7 +196,7 @@ docs: src/* Doxyfile
 	doxygen ./Doxyfile > /dev/null
 
 clean:
-	rm -f *.o Mist* src/controller/server.html src/connectors/embed.js.h src/controller/server.html.h
+	rm -f *.o Mist* sourcery src/controller/server.html src/connectors/embed.js.h src/controller/server.html.h
 	rm -rf ./docs
 
 install: controller buffers connectors analysers converters