diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index 79fbb36b25e..e0b5f83901e 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -116,6 +116,8 @@ if ( CGAL_BRANCH_BUILD )
 
   #define CGAL_VERSION 3.5-I-135
   message(STATUS "CGAL_VERSION is ${CGAL_CREATED_VERSION}")
+  set(CGAL_FULL_VERSION ${CGAL_CREATED_VERSION})
+
 
   #define CGAL_VERSION_NR 1030500135
   string (LENGTH "${CGAL_MAJOR_VERSION}" CGAL_MAJOR_LEN)
@@ -226,6 +228,7 @@ else()
   #
 
   file( READ "${CMAKE_SOURCE_DIR}/VERSION" CGAL_VERSION )
+  set(CGAL_FULL_VERSION ${CGAL_VERSION})
   string( REPLACE "-" "." CGAL_VERSION_TOKENS1 ${CGAL_VERSION} )
   string( REPLACE "." ";" CGAL_VERSION_TOKENS ${CGAL_VERSION_TOKENS1} )
   list( LENGTH CGAL_VERSION_TOKENS CGAL_VERSION_TOKENS_LEN )
diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt
index 7713c1fdc32..e08392ea04d 100644
--- a/Installation/src/CMakeLists.txt
+++ b/Installation/src/CMakeLists.txt
@@ -37,15 +37,15 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES)
   else(NOT CGAL_AUTO_LINK_ENABLED)
     set(${LIBRARY_NAME}_LIBRARY)
     if(CGAL_BUILD_SHARED_LIBS)
-      set(CGAL_LIB_PREFIX "lib")
-    else()
       set(CGAL_LIB_PREFIX "")
-    endif()        
+    else()
+      set(CGAL_LIB_PREFIX "lib")
+    endif()
 
-    set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME        "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_VERSION}" ) 
-    set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME          "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_VERSION}" ) 
-    set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME     "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o-${CGAL_VERSION}" ) 
-    set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g-${CGAL_VERSION}" ) 
+    set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME        "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_FULL_VERSION}" ) 
+    set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME          "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_FULL_VERSION}" ) 
+    set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME     "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o-${CGAL_FULL_VERSION}" ) 
+    set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g-${CGAL_FULL_VERSION}" ) 
     
     set_target_properties( ${LIBRARY_NAME} PROPERTIES DEBUG_OUTPUT_NAME          "${${LIBRARY_NAME}_DEBUG_MANGLED_NAME}" 
       RELEASE_OUTPUT_NAME        "${${LIBRARY_NAME}_RELEASE_MANGLED_NAME}"