diff --git a/ground/openpilotgcs.pri b/ground/openpilotgcs.pri
index 986695ac5..6c4ce68e0 100644
--- a/ground/openpilotgcs.pri
+++ b/ground/openpilotgcs.pri
@@ -15,6 +15,10 @@ defineReplace(targetPath) {
     return($$replace(1, /, $$QMAKE_DIR_SEP))
 }
 
+defineReplace(addNewline) { 
+    return($$escape_expand(\n\t)) 
+}
+
 # For use in custom compilers which just copy files
 win32:i_flag = i
 defineReplace(stripSrcDir) {
@@ -72,8 +76,8 @@ macx {
     GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
     GCS_PLUGIN_PATH  = $$GCS_LIBRARY_PATH/plugins
     GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME
-    GCS_DATA_PATH    = $$GCS_BUILD_TREE/share/openpilotgcs
-    GCS_DOC_PATH     = $$GCS_BUILD_TREE/share/doc/openpilotgcs
+    GCS_DATA_PATH    = $$GCS_BUILD_TREE/share
+    GCS_DOC_PATH     = $$GCS_BUILD_TREE/share/doc
     !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
 }
 
diff --git a/ground/share/share.pro b/ground/share/share.pro
index 8e3a8bf47..7d9d86cce 100644
--- a/ground/share/share.pro
+++ b/ground/share/share.pro
@@ -1,11 +1,18 @@
+include(../openpilotgcs.pri)
+
 TEMPLATE = subdirs
 SUBDIRS = openpilotgcs/translations
-SUBDIRS += openpilotgcs/sounds
-SUBDIRS += openpilotgcs/dials
-SUBDIRS += openpilotgcs/models
-SUBDIRS += openpilotgcs/pfd
-
-
-
+
+DATACOLLECTIONS = dials models pfd sounds
+
+equals(copydata, 1) {
+    for(dir, DATACOLLECTIONS) {
+        exists(openpilotgcs/$$dir) {
+            data_copy.commands += $(COPY_DIR) $$targetPath($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) $$targetPath($$GCS_DATA_PATH/$$dir) $$addNewline()
+        }
+    }
+    data_copy.target = FORCE
+    QMAKE_EXTRA_TARGETS += data_copy                   
+}