diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index 73122cb64..2a5b1c175 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -117,7 +117,15 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS
 NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
 NL_ADD_RUNTIME_FLAGS(ryzom_client)
 
-NL_ADD_LIB_SUFFIX(ryzom_client)
+IF(FINAL_VERSION)
+  NL_ADD_LIB_SUFFIX(ryzom_client)
+ELSE()
+  IF(WIN32)
+    SET_TARGET_PROPERTIES(ryzom_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r")
+  ELSE()
+    SET_TARGET_PROPERTIES(ryzom_client PROPERTIES POSTFIX "_dev")
+  ENDIF()
+ENDIF()
 
 IF(WITH_RYZOM_CLIENT_UAC)
   IF(CMAKE_GENERATOR MATCHES "Visual Studio")