diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 1b6729756f7c442e4079e495866135b0b1e1af0e..9e92df35d37dde3c38fb54525bafc8a2a59ecc5c 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -376,11 +376,12 @@ contains (DEFINES, DISABLE_SPEECH) {
 }
 # Mac support is built into OS 10.6+.
 else:MacBuild {
-	message("Including support for speech output")
-	DEFINES += QGC_SPEECH_ENABLED
+    message("Including support for speech output")
+    DEFINES += QGC_SPEECH_ENABLED
 }
 # Windows supports speech through native API.
 else:WindowsBuild {
-	message("Including support for speech output")
-	DEFINES += QGC_SPEECH_ENABLED
+    message("Including support for speech output")
+    DEFINES += QGC_SPEECH_ENABLED
+    LIBS    += -lOle32
 }
diff --git a/QGCSetup.pri b/QGCSetup.pri
index 2e12bc53fc692d2ecf48e4255d57ab9722a99610..4881fef1ea64e7685ed5593a201f4ebf01c45e11 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -151,13 +151,13 @@ MacBuild {
 }
 
 WindowsBuild {
-	BASEDIR_WIN = $$replace(BASEDIR, "/", "\\")
-	DESTDIR_WIN = $$replace(DESTDIR, "/", "\\")
-	D_DIR = $$[QT_INSTALL_LIBEXECS]
-	DLL_DIR = $$replace(D_DIR, "/", "\\")
+    BASEDIR_WIN = $$replace(BASEDIR, "/", "\\")
+    DESTDIR_WIN = $$replace(DESTDIR, "/", "\\")
+    D_DIR = $$[QT_INSTALL_LIBEXECS]
+    DLL_DIR = $$replace(D_DIR, "/", "\\")
 
-	# Copy dependencies
-	DebugBuild: DLL_QT_DEBUGCHAR = "d"
+    # Copy dependencies
+    DebugBuild: DLL_QT_DEBUGCHAR = "d"
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
         $$BASEDIR\\libs\\lib\\sdl\\win32\\SDL.dll \
@@ -188,12 +188,12 @@ WindowsBuild {
 		QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
     }
 
-	# Copy platform plugins
-	P_DIR = $$[QT_INSTALL_PLUGINS]
-	PLUGINS_DIR_WIN = $$replace(P_DIR, "/", "\\")
-	QMAKE_POST_LINK += $$escape_expand(\\n) mkdir release\\platforms
-	QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$PLUGINS_DIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\" \"$$DESTDIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\"
-	QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\imageformats\" \"$$DESTDIR_WIN\\imageformats\"
+    # Copy platform plugins
+    P_DIR = $$[QT_INSTALL_PLUGINS]
+    PLUGINS_DIR_WIN = $$replace(P_DIR, "/", "\\")
+    QMAKE_POST_LINK += $$escape_expand(\\n) mkdir "$$DESTDIR_WIN\\platforms"
+    QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY     \"$$PLUGINS_DIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\" \"$$DESTDIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\"
+    QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\imageformats\" \"$$DESTDIR_WIN\\imageformats\"
     QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\sqldrivers\" \"$$DESTDIR_WIN\\sqldrivers\"
     QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\bearer\" \"$$DESTDIR_WIN\\bearer\"
     QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\iconengines\" \"$$DESTDIR_WIN\\iconengines\"