diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt
index 547b1a470..1a0b0da3f 100644
--- a/code/ryzom/common/src/game_share/CMakeLists.txt
+++ b/code/ryzom/common/src/game_share/CMakeLists.txt
@@ -1,5 +1,12 @@
-FILE(GLOB SRC *.cpp time_weather_season/*.cpp)
-FILE(GLOB PRIV_H *.h time_weather_season/*.h)
+FIND_PACKAGE(ZLIB REQUIRED)
+
+FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC_TIME time_weather_season/*.cpp)
+
+FILE(GLOB PRIV_H *.h)
+FILE(GLOB PRIV_TIME_H time_weather_season/*.h)
+
+SET(HEADER ${PRIV_H})
 
 FILE(GLOB R2 
 	dms.h dms.cpp
@@ -17,20 +24,21 @@ FILE(GLOB R2
 	ring_*.h ring_*.cpp)
 
 LIST(REMOVE_ITEM SRC R2)
-LIST(REMOVE_ITEM PRIV_H R2)
+LIST(REMOVE_ITEM HEADER R2)
 
-SOURCE_GROUP("" FILES ${SRC} ${PRIV_H})
+SOURCE_GROUP("" FILES ${SRC} ${HEADER})
+SOURCE_GROUP("time_weather_season" FILES ${SRC_TIME} ${PRIV_TIME_H})
 SOURCE_GROUP("R2" FILES ${R2})
 
 # Filter out the source files not actually compiled.
 LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
-LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
+LIST(REMOVE_ITEM HEADER ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
 
-NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC} ${R2})
+NL_TARGET_LIB(ryzom_gameshare ${HEADER} ${PRIV_TIME_H} ${SRC} ${SRC_TIME} ${R2})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-TARGET_LINK_LIBRARIES(ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
+TARGET_LINK_LIBRARIES(ryzom_gameshare ${NELMISC_LIBRARIES} ${NELNET_LIBRARIES} ${NELLIGO_LIBRARIES} ${NELGEORGES_LIBRARIES})
 NL_DEFAULT_PROPS(ryzom_gameshare "Ryzom, Library: Game Share")
 NL_ADD_RUNTIME_FLAGS(ryzom_gameshare)
 NL_ADD_LIB_SUFFIX(ryzom_gameshare)
@@ -44,3 +52,9 @@ ENDIF()
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_gameshare LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF()
+
+IF(WITH_INSTALL_LIBRARIES)
+  INSTALL(FILES ${PRIV_H} DESTINATION include/ryzom/game_share COMPONENT headers)
+  INSTALL(FILES ${PRIV_TIME_H} DESTINATION include/ryzom/game_share/time_weather_season COMPONENT headers)
+ENDIF()
+