diff --git a/QGCSetup.pri b/QGCSetup.pri
index 0eec6298d9840b83c16ae6fbf7e84b18e67cf04a..f0e151d165bf5922bb54a034ddb20a36ec5e4444 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -100,7 +100,7 @@ WindowsBuild {
 
 LinuxBuild {
     installer {
-        QMAKE_POST_LINK += && mkdir -p $$DESTDIR/libs
+        QMAKE_POST_LINK += && mkdir -p $$DESTDIR/Qt/libs && mkdir -p $$DESTDIR/Qt/plugins
 
         # QT_INSTALL_LIBS
         QT_LIB_LIST = \
@@ -129,22 +129,30 @@ LinuxBuild {
         }
 
         for(QT_LIB, QT_LIB_LIST) {
-            QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/libs
+            QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/Qt/libs/
         }
 
         # QT_INSTALL_PLUGINS
-        QT_PLUGIN_LIST = platforms
+        QT_PLUGIN_LIST = \
+            bearer \
+            geoservices \
+            iconengines \
+            imageformats \
+            platforminputcontexts \
+            platforms \
+            platformthemes \
+            position
 
         !contains(DEFINES, __rasp_pi2__) {
             QT_PLUGIN_LIST += xcbglintegrations
         }
 
         for(QT_PLUGIN, QT_PLUGIN_LIST) {
-            QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/libs
+            QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/Qt/plugins/
         }
 
         # QT_INSTALL_QML
-        QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_QML] $$DESTDIR/libs
+        QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_QML] $$DESTDIR/Qt/
 
         # QGroundControl start script
         QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR
diff --git a/deploy/qgroundcontrol-start.sh b/deploy/qgroundcontrol-start.sh
index 6cd22d28e582651681298189a433e008f89ddc85..e87615aa2458c4858438485302283282bd396e3b 100755
--- a/deploy/qgroundcontrol-start.sh
+++ b/deploy/qgroundcontrol-start.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
-export LD_LIBRARY_PATH=`pwd`/libs:$LD_LIBRARY_PATH
-export QML_IMPORT_PATH=`pwd`/libs/qml
-export QML2_IMPORT_PATH=`pwd`/libs/qml
-export QT_QPA_PLATFORM_PLUGIN_PATH=`pwd`/libs/platforms
+export LD_LIBRARY_PATH=`pwd`/Qt/libs:$LD_LIBRARY_PATH
+export QML2_IMPORT_PATH=`pwd`/Qt/qml
+export QT_PLUGIN_PATH=`pwd`/Qt/plugins
 ./qgroundcontrol "$@"
diff --git a/qgroundcontrol.desktop b/qgroundcontrol.desktop
old mode 100644
new mode 100755