diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index c60c54ccb..0c8ed32fd 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -142,11 +142,7 @@ else()
 	list(APPEND LINPHONE_SOURCE_FILES_C linphone_tunnel_stubs.c)
 endif()
 
-find_package(Git)
-add_custom_target(liblinphone-git-version
-	COMMAND ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DLINPHONE_VERSION=${LINPHONE_VERSION} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/gitversion.cmake
-	BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/liblinphone_gitversion.h"
-)
+bc_git_version(liblinphone ${PROJECT_VERSION})
 
 add_definitions(
 	-DUSE_BELLESIP
diff --git a/coreapi/gitversion.cmake b/coreapi/gitversion.cmake
deleted file mode 100644
index ca9284bae..000000000
--- a/coreapi/gitversion.cmake
+++ /dev/null
@@ -1,52 +0,0 @@
-############################################################################
-# gitversion.cmake
-# Copyright (C) 2014  Belledonne Communications, Grenoble France
-#
-############################################################################
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-############################################################################
-
-if(GIT_EXECUTABLE)
-	macro(GIT_COMMAND OUTPUT_VAR)
-		set(GIT_ARGS ${ARGN})
-		execute_process(
-			COMMAND ${GIT_EXECUTABLE} ${ARGN}
-			WORKING_DIRECTORY ${WORK_DIR}
-			OUTPUT_VARIABLE ${OUTPUT_VAR}
-			OUTPUT_STRIP_TRAILING_WHITESPACE
-		)
-	endmacro()
-
-	GIT_COMMAND(GIT_DESCRIBE describe --always)
-	GIT_COMMAND(GIT_TAG describe --abbrev=0)
-	GIT_COMMAND(GIT_REVISION rev-parse HEAD)
-endif()
-
-if(GIT_DESCRIBE)
-	if(NOT GIT_TAG STREQUAL LINPHONE_VERSION)
-		message(FATAL_ERROR "LINPHONE_VERSION (${LINPHONE_VERSION}) and git tag (${GIT_TAG}) differ. Please put them identical")
-	endif()
-	set(LIBLINPHONE_GIT_VERSION "${GIT_DESCRIBE}")
-	configure_file("${WORK_DIR}/gitversion.h.in" "${OUTPUT_DIR}/liblinphone_gitversion.h" @ONLY)
-elseif(GIT_REVISION)
-	set(LIBLINPHONE_GIT_VERSION "${LINPHONE_VERSION}_${GIT_REVISION}")
-	configure_file("${WORK_DIR}/gitversion.h.in" "${OUTPUT_DIR}/liblinphone_gitversion.h" @ONLY)
-else()
-	if(NOT EXISTS "${OUTPUT_DIR}/liblinphone_gitversion.h")
-		execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${OUTPUT_DIR}/liblinphone_gitversion.h")
-	endif()
-endif()
diff --git a/coreapi/gitversion.h.in b/coreapi/gitversion.h.in
deleted file mode 100644
index ab0efd602..000000000
--- a/coreapi/gitversion.h.in
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-linphone
-Copyright (C) 2010-2014  Belledonne Communications SARL
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-#define LIBLINPHONE_GIT_VERSION "@LIBLINPHONE_GIT_VERSION@"
\ No newline at end of file
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6479e1b31..621640ffa 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "liblinphone_gitversion.h"
+#include "gitversion.h"
 #endif
 
 #ifdef __APPLE__