diff --git a/eo/CMakeLists.txt b/eo/CMakeLists.txt
index fa789d4d..52840cf6 100644
--- a/eo/CMakeLists.txt
+++ b/eo/CMakeLists.txt
@@ -14,12 +14,11 @@ INCLUDE(eo-conf.cmake OPTIONAL)
 # set the project name and other variables
 PROJECT(EO)
 
-SET(PROJECT_VERSION_MAJOR 1)
-SET(PROJECT_VERSION_MINOR 1)
-SET(PROJECT_VERSION_PATCH 1)
+#SET(PROJECT_VERSION_MAJOR 1)
+#SET(PROJECT_VERSION_MINOR 1)
+#SET(PROJECT_VERSION_PATCH 1)
 SET(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" CACHE STRING "Package version" FORCE)
-#SET(VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" CACHE STRING "Global version" FORCE)
-SET(VERSION "1.1.1-edge" CACHE STRING "Global version" FORCE)
+SET(VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}${PROJECT_VERSION_MISC}" CACHE STRING "Global version" FORCE)
 SET(GLOBAL_VERSION "${VERSION}")
 
 SET(PACKAGE_BUGREPORT "eodev-help@sourceforge.net" CACHE STRING "Package bug report" FORCE)
diff --git a/eo/ForRelease b/eo/ForRelease
index bd09cf4f..621ee19c 100644
--- a/eo/ForRelease
+++ b/eo/ForRelease
@@ -1,19 +1,13 @@
-In order to create a new release from the current cvs sources perform the
+In order to create a new release from the current repository, perform the
 following steps:
 
-- Set version number in configure.in and doc/eo.cfg
+- Create a branch named "eo_x.y.z"
+- Set version number in eo-conf.cmake
 - Check/update NEWS file, set release date and version in NEWS.
-- Run `make check && make dist`
-- Test distribution (unpack, configure, make check)
-- Tag released code in cvs, in order to allow a branch to be created at that
-  version if the necessity will arise later
-- Put distribution files at SourceForge
+- use the "archive_current.sh" script to create the source archive
+- Build the packages
+- Put source archive and packages files at SourceForge
 - Post news on SourceForge project-page
 - Send announcement to mailing lists
-- Bump version number to next x.y.z-cvs in configure.in and doc/eo.cfg
+- Bump version number to next "x.y.z-edge" in eo-conf.cmake
 
-# Local Variables:
-# coding: iso-8859-1
-# mode: text
-# fill-column: 80
-# End:
diff --git a/eo/eo-conf.cmake b/eo/eo-conf.cmake
new file mode 100644
index 00000000..417c6b43
--- /dev/null
+++ b/eo/eo-conf.cmake
@@ -0,0 +1,7 @@
+
+# Current version
+SET(PROJECT_VERSION_MAJOR 1)
+SET(PROJECT_VERSION_MINOR 2)
+SET(PROJECT_VERSION_PATCH 0)
+SET(PROJECT_VERSION_MISC "-edge")
+