diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
index 540ee3ab7..70cc992ae 100644
--- a/jerry-core/CMakeLists.txt
+++ b/jerry-core/CMakeLists.txt
@@ -112,33 +112,6 @@ endif()
 # Valgrind
 set(INCLUDE_THIRD_PARTY_VALGRIND "${CMAKE_SOURCE_DIR}/third-party/valgrind")
 
-# Definitions
-# Get version information from git
-if(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/.git")
-  execute_process(COMMAND git symbolic-ref -q HEAD
-                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                  OUTPUT_VARIABLE JERRY_GIT_BRANCH
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND git rev-parse HEAD
-                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                  OUTPUT_VARIABLE JERRY_GIT_COMMIT
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-else()
-  set(JERRY_GIT_BRANCH "UNDEFINED")
-  set(JERRY_GIT_COMMIT "UNDEFINED")
-endif()
-
-# Get build date
-execute_process(COMMAND date +%d/%m/%Y
-                OUTPUT_VARIABLE JERRY_BUILD_DATE
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-set(DEFINES_JERRY
-    ${DEFINES_JERRY}
-    JERRY_BUILD_DATE="${JERRY_BUILD_DATE}"
-    JERRY_COMMIT_HASH="${JERRY_GIT_COMMIT}"
-    JERRY_BRANCH_NAME="${JERRY_GIT_BRANCH}")
-
 # build mode specific compile/link flags
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_NDEBUG)
diff --git a/jerry-main/CMakeLists.txt b/jerry-main/CMakeLists.txt
index 5da49b9f0..602a86291 100644
--- a/jerry-main/CMakeLists.txt
+++ b/jerry-main/CMakeLists.txt
@@ -21,7 +21,7 @@ project (${JERRY_NAME} C)
 # Jerry standalone
 set(SOURCE_JERRY_STANDALONE_MAIN main-unix.c)
 
-# Generage map file
+# Generate map file
 if("${PLATFORM}" STREQUAL "DARWIN")
   set(MAP_FILE_FLAGS "-Xlinker -map")
 else()
@@ -36,6 +36,19 @@ if(NOT ("${PLATFORM}" STREQUAL "DARWIN"))
   set(LINKER_FLAGS_STATIC "-static")
 endif()
 
+# Get version information from git
+if(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/.git")
+  execute_process(COMMAND git rev-parse --short HEAD
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                  OUTPUT_VARIABLE JERRY_COMMIT_HASH
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set(JERRY_COMMIT_HASH " (${JERRY_COMMIT_HASH})")
+else()
+  set(JERRY_COMMIT_HASH "")
+endif()
+
+set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_COMMIT_HASH="${JERRY_COMMIT_HASH}")
+
 add_executable(${JERRY_NAME} ${SOURCE_JERRY_STANDALONE_MAIN})
 set_property(TARGET ${JERRY_NAME}
              PROPERTY LINK_FLAGS "${LINKER_FLAGS_STATIC} ${LINKER_FLAGS_COMMON}")
diff --git a/jerry-main/main-unix.c b/jerry-main/main-unix.c
index 84ebf1b1a..aba0ae9f2 100644
--- a/jerry-main/main-unix.c
+++ b/jerry-main/main-unix.c
@@ -193,7 +193,7 @@ main (int argc,
     }
     else if (!strcmp ("-v", argv[i]) || !strcmp ("--version", argv[i]))
     {
-      jerry_port_console ("Version: \t%d.%d\n\n", JERRY_API_MAJOR_VERSION, JERRY_API_MINOR_VERSION);
+      jerry_port_console ("Version: %d.%d%s\n", JERRY_API_MAJOR_VERSION, JERRY_API_MINOR_VERSION, JERRY_COMMIT_HASH);
       return JERRY_STANDALONE_EXIT_CODE_OK;
     }
     else if (!strcmp ("--mem-stats", argv[i]))