diff --git a/code/ryzom/client/CMakeLists.txt b/code/ryzom/client/CMakeLists.txt
index 4b7537b55..642244536 100644
--- a/code/ryzom/client/CMakeLists.txt
+++ b/code/ryzom/client/CMakeLists.txt
@@ -1 +1,7 @@
 ADD_SUBDIRECTORY(src)
+
+IF(UNIX AND NOT APPLE)
+  ADD_SUBDIRECTORY(unix)
+ENDIF(UNIX AND NOT APPLE)
+
+INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX})
diff --git a/code/ryzom/client/unix/CMakeLists.txt b/code/ryzom/client/unix/CMakeLists.txt
new file mode 100644
index 000000000..df17996fe
--- /dev/null
+++ b/code/ryzom/client/unix/CMakeLists.txt
@@ -0,0 +1,4 @@
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom.desktop")
+
+INSTALL(FILES ryzom.png DESTINATION share/pixmaps)
+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom.desktop" DESTINATION share/applications)
diff --git a/code/ryzom/client/unix/ryzom.desktop.in b/code/ryzom/client/unix/ryzom.desktop.in
new file mode 100644
index 000000000..da04de87c
--- /dev/null
+++ b/code/ryzom/client/unix/ryzom.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Ryzom
+Type=Application
+GenericName=ryzom
+Comment=Ryzom MMORPG client
+Exec=${RYZOM_BIN_PREFIX}/ryzom_client
+Icon=ryzom
+Terminal=false
+Hidden=false
+Categories=Game;RolePlaying;
diff --git a/code/ryzom/client/unix/ryzom.png b/code/ryzom/client/unix/ryzom.png
new file mode 100644
index 000000000..43aae082f
Binary files /dev/null and b/code/ryzom/client/unix/ryzom.png differ
diff --git a/code/ryzom/common/CMakeLists.txt b/code/ryzom/common/CMakeLists.txt
index 4b7537b55..dbf1c937d 100644
--- a/code/ryzom/common/CMakeLists.txt
+++ b/code/ryzom/common/CMakeLists.txt
@@ -1 +1,10 @@
 ADD_SUBDIRECTORY(src)
+
+#ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/share/data_common.bnp"
+#  COMMAND bnp_make -p ${CMAKE_CURRENT_SOURCE_DIR}/data_common ${CMAKE_BINARY_DIR}/share > /dev/null)
+
+#ADD_CUSTOM_TARGET(data_common ALL
+#  DEPENDS "${CMAKE_BINARY_DIR}/share/data_common.bnp")
+
+#INSTALL(TARGETS data_common ARCHIVE DESTINATION ${RYZOM_SHARE_PREFIX}/data)
+#INSTALL(FILES "${CMAKE_BINARY_DIR}/share/data_common.bnp" DESTINATION "${RYZOM_SHARE_PREFIX}/data")