diff --git a/RetroShare.pro b/RetroShare.pro
index aaa1bbfde..4a1be6b49 100644
--- a/RetroShare.pro
+++ b/RetroShare.pro
@@ -26,38 +26,12 @@ pegmarkdown.file = supportlibs/pegmarkdown/pegmarkdown.pro
 
 retroshare_gui.file = retroshare-gui/src/retroshare-gui.pro
 retroshare_gui.depends = libretroshare libresapi pegmarkdown
+retroshare_gui.target = retroshare-gui
 
 retroshare_nogui.file = retroshare-nogui/src/retroshare-nogui.pro
 retroshare_nogui.depends = libretroshare libresapi
+retroshare_nogui.target = retroshare-nogui
 
 plugins.file = plugins/plugins.pro
 plugins.depends = retroshare_gui
-
-unix {
-	icon_files.path = "$${PREFIX}/share/icons/hicolor"
-	icon_files.files = data/24x24
-	icon_files.files += data/48x48
-	icon_files.files += data/64x64
-	icon_files.files += data/128x128
-	INSTALLS += icon_files
-
-	desktop_files.path = "$${PREFIX}/share/applications"
-	desktop_files.files = data/retroshare06.desktop
-	INSTALLS += desktop_files
-
-	pixmap_files.path = "$${PREFIX}/share/pixmaps"
-	pixmap_files.files = data/retroshare06.xpm
-	INSTALLS += pixmap_files
-
-	data_files.path = "$${DATA_DIR}"
-	data_files.files = libbitdht/src/bitdht/bdboot.txt
-	INSTALLS += data_files
-
-	webui_files.path = "$${DATA_DIR}/webui"
-	webui_files.files = libresapi/src/webfiles/*
-	INSTALLS += webui_files
-
-	webui_img_files.path = "$${DATA_DIR}/webui/img"
-	webui_img_files.files = retroshare-gui/src/gui/images/logo/logo_splash.png
-	INSTALLS += webui_img_files
-}
+plugins.target = plugins
diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro
index ed576a700..7d6dca1d6 100644
--- a/libbitdht/src/libbitdht.pro
+++ b/libbitdht/src/libbitdht.pro
@@ -39,6 +39,13 @@ linux-g++-64 {
 	OBJECTS_DIR = temp/linux-g++-64/obj
 }
 
+unix {
+	data_files.path = "$${DATA_DIR}"
+	data_files.files = bitdht/bdboot.txt
+	INSTALLS += data_files
+}
+
+
 #################### Cross compilation for windows under Linux ####################
 
 win32-x-g++ {	
diff --git a/libresapi/src/libresapi.pro b/libresapi/src/libresapi.pro
index cc12e1503..a45255e45 100644
--- a/libresapi/src/libresapi.pro
+++ b/libresapi/src/libresapi.pro
@@ -10,6 +10,16 @@ CONFIG += libmicrohttpd
 
 INCLUDEPATH += ../../libretroshare/src
 
+unix {
+	webui_files.path = "$${DATA_DIR}/webui"
+	webui_files.files = webfiles/*
+	INSTALLS += webui_files
+
+	webui_img_files.path = "$${DATA_DIR}/webui/img"
+	webui_img_files.files = ../../retroshare-gui/src/gui/images/logo/logo_splash.png
+	INSTALLS += webui_img_files
+}
+
 win32{
 	DEFINES *= WINDOWS_SYS
 	INCLUDEPATH += $$PWD/../../../libs/include
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 6632c871f..57a8a88d8 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -122,6 +122,22 @@ unix {
 	style_files.path="$${DATA_DIR}/stylesheets"
 	style_files.files=gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
 	INSTALLS += style_files
+
+	icon_files.path = "$${PREFIX}/share/icons/hicolor"
+	icon_files.files =  ../../data/24x24
+	icon_files.files += ../../data/48x48
+	icon_files.files += ../../data/64x64
+	icon_files.files += ../../data/128x128
+	INSTALLS += icon_files
+
+	desktop_files.path = "$${PREFIX}/share/applications"
+	desktop_files.files = ../../data/retroshare06.desktop
+	INSTALLS += desktop_files
+
+	pixmap_files.path = "$${PREFIX}/share/pixmaps"
+	pixmap_files.files = ../../data/retroshare06.xpm
+	INSTALLS += pixmap_files
+
 }
 
 linux-g++ {