diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index 2ec590a7e8..11e45b0002 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -7,14 +7,6 @@ find_package(Threads REQUIRED)
 
 pkg_check_modules(CHECK check)
 
-set(VMAJ ${PROJECT_VERSION_MAJOR})
-set(VMIN ${PROJECT_VERSION_MINOR})
-set(VMIC ${PROJECT_VERSION_PATCH})
-set(VREV ${PROJECT_VERSION_TWEAK})
-set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(MODULE_ARCH "v-${VMAJ}.${VMIN}")
-
 EFL_OPTION(BUILD_PROFILE "How to build EFL" dev CHOICE release;dev;debug)
 EFL_OPTION(EFL_NOLEGACY_API_SUPPORT "Whenever to disable non-Eo (Legacy) APIs" ON)
 EFL_OPTION(EFL_EO_API_SUPPORT "Whenever to enable new Eo APIs" ON)
@@ -34,4 +26,4 @@ set(EFL_BETA_API_SUPPORT 1)
 
 if (CMAKE_THREAD_LIBS_INIT)
     set(EFL_HAVE_THREADS 1)
-endif()
\ No newline at end of file
+endif()
diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake
index a7fd4bc4cf..f664e52665 100644
--- a/src/lib/efl/config.h.cmake
+++ b/src/lib/efl/config.h.cmake
@@ -5,10 +5,10 @@
 
 #include "config_headers.h"
 
-#define VMAJ @VMAJ@
-#define VMIN @VMIN@
-#define VMIC @VMIC@
-#define VREV @VREV@
+#define VMAJ @PROJECT_VERSION_MAJOR@
+#define VMIN @PROJECT_VERSION_MINOR@
+#define VMIC @PROJECT_VERSION_PATCH@
+#define VREV @PROJECT_VERSION_TWEAK@
 
 #cmakedefine NVALGRIND 1
 
@@ -16,7 +16,7 @@
 #cmakedefine EINA_STATIC_BUILD_ONE_BIG 1
 #cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1
 
-#define MODULE_ARCH "@MODULE_ARCH@"
+#define MODULE_ARCH "v-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@"
 #define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
 #define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@"