diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ebbc14..afd4c45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,11 +94,12 @@ message( STATUS "OpenSSL version ${OPENSSL_VERSION}" )
 
 set( VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} )
 set( VERSION_MINOR ${OPENSSL_VERSION_MINOR} )
-set( VERSION_PATCH ${OPENSSL_VERSION_PATCH} )
+set( VERSION_PATCH ${OPENSSL_VERSION_FIX} )
 
-set( VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} )
+set( VERSION_STRING ${OPENSSL_VERSION} )
 set( LIB_VERSION ${VERSION_MAJOR}.${VERSION_MINOR} )
 set( LIB_SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR} )
+set( CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION_STRING}" )
 
 include_directories ( BEFORE SYSTEM
     ${CMAKE_CURRENT_BINARY_DIR}/crypto