diff --git a/GEOM_version.h.in b/GEOM_version.h.in
new file mode 100644
index 000000000..4be8dc3e8
--- /dev/null
+++ b/GEOM_version.h.in
@@ -0,0 +1,34 @@
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License.
+// 
+// This library 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 
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/
+//
+//  File   : GEOM_version.h
+//  Author : Vadim SANDLER
+//  Module : SALOME
+
+#if !defined(__GEOM_VERSION_H__)
+#define __GEOM_VERSION_H__
+
+/*
+  GEOM_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define GEOM_VERSION_STR "@VERSION@"
+#define GEOM_VERSION     @XVERSION@
+
+#endif // __GEOM_VERSION_H__
diff --git a/INSTALL b/INSTALL
index 7ea5b07c3..71869d64e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1 @@
-This is the version 3.2.0b1 of GEOM
-Compatible with :
-	- KERNEL 3.2.0b1
-        - GUI 3.2.0b1
+SALOME2 : GEOM module
diff --git a/Makefile.in b/Makefile.in
index 59fff7112..eeb82468e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 
 @COMMENCE@
@@ -200,11 +200,12 @@ undo.png
 BIN_SCRIPT= \
 VERSION
 
+include_list = include/salome/SALOMEconfig.h \
+               include/salome/GEOM_version.h
+
 # copy header files in common directory
-ifeq ($(HAVE_SSTREAM),yes)
-  include_list=include/salome/SALOMEconfig.h
-else
-  include_list=include/salome/SALOMEconfig.h include/salome/sstream
+ifneq ($(HAVE_SSTREAM),yes)
+	include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
@@ -226,6 +227,9 @@ include/salome/sstream: salome_adm/unix/sstream
 	-$(RM) $@
 	$(LN_S) ../../$< $@
 
+include/salome/GEOM_version.h: GEOM_version.h
+	cp $< $@
+
 depend: depend_idl
 
 depend_idl:
diff --git a/bin/VERSION b/bin/VERSION
deleted file mode 100755
index 8f29be47a..000000000
--- a/bin/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS SALOME - GEOM VERSION: 3.2.0b1
diff --git a/bin/VERSION.in b/bin/VERSION.in
new file mode 100755
index 000000000..108ad2265
--- /dev/null
+++ b/bin/VERSION.in
@@ -0,0 +1 @@
+THIS IS SALOME - GEOM VERSION: @VERSION@
diff --git a/configure.in.base b/configure.in.base
index 33bb2f013..7315b9d21 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -23,8 +23,10 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+VERSION=3.2.0
+XVERSION=0x030200
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
 
 dnl
 dnl Initialize source and build root directories
diff --git a/doc/salome/tui/GEOM/doxyfile b/doc/salome/tui/GEOM/doxyfile.in
similarity index 99%
rename from doc/salome/tui/GEOM/doxyfile
rename to doc/salome/tui/GEOM/doxyfile.in
index fbab9009d..9d4d118db 100755
--- a/doc/salome/tui/GEOM/doxyfile
+++ b/doc/salome/tui/GEOM/doxyfile.in
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - GEOM - v.version"
+PROJECT_NAME           = "SALOME - GEOM - v.@VERSION@"
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = ../
 CREATE_SUBDIRS         = NO
diff --git a/doc/salome/tui/GEOM/doxyfile_py b/doc/salome/tui/GEOM/doxyfile_py.in
similarity index 99%
rename from doc/salome/tui/GEOM/doxyfile_py
rename to doc/salome/tui/GEOM/doxyfile_py.in
index fbab9009d..9d4d118db 100755
--- a/doc/salome/tui/GEOM/doxyfile_py
+++ b/doc/salome/tui/GEOM/doxyfile_py.in
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - GEOM - v.version"
+PROJECT_NAME           = "SALOME - GEOM - v.@VERSION@"
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = ../
 CREATE_SUBDIRS         = NO
diff --git a/doc/salome/tui/GEOM/sources/static/tree.js b/doc/salome/tui/GEOM/sources/static/tree.js.in
similarity index 97%
rename from doc/salome/tui/GEOM/sources/static/tree.js
rename to doc/salome/tui/GEOM/sources/static/tree.js.in
index 6323d4936..52841f853 100755
--- a/doc/salome/tui/GEOM/sources/static/tree.js
+++ b/doc/salome/tui/GEOM/sources/static/tree.js.in
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.3.2.0b1 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.@VERSION@ </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
index 6da889780..0c3f148a3 100644
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -24,11 +24,11 @@ PYTHON_SCRIPTS = \
 
 docs:
 	cp -fr $(srcdir)/GEOM ./INPUT
+	cp -fr ./GEOM/doxyfile ./GEOM/doxyfile_py ./INPUT
 	cd INPUT; \
 	sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
 	sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
-	sed "s|version|`cut -d: -f2 $(root_srcdir)/bin/VERSION`|" ./doxyfile2 > ./doxyfile3; \
-	mv -f doxyfile3 doxyfile1; \
+	mv -f doxyfile2 doxyfile1; \
 	if (test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
 	  echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
 	  sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
diff --git a/resources/GEOMCatalog.xml b/resources/GEOMCatalog.xml.in
similarity index 99%
rename from resources/GEOMCatalog.xml
rename to resources/GEOMCatalog.xml.in
index 4cd8ce2cd..a47a5f49f 100644
--- a/resources/GEOMCatalog.xml
+++ b/resources/GEOMCatalog.xml.in
@@ -16,7 +16,7 @@
         <component-username>Geometry</component-username>
         <component-type>Geom</component-type>
         <component-author>NRI</component-author>
-        <component-version>3.2.0b1</component-version>
+        <component-version>@VERSION@</component-version>
         <component-comment>Geometry component</component-comment>
         <component-multistudy>1</component-multistudy>
         <component-icone>ModuleGeom.png</component-icone>
@@ -527,7 +527,7 @@
             <component-username>GEOM_Superv</component-username>
             <component-type>OTHER</component-type>
             <component-author>mkr</component-author>
-            <component-version>3.2.0b1</component-version>
+            <component-version>@VERSION@</component-version>
             <component-comment>Supervision wrapper for Geometry component</component-comment>
             <component-multistudy>1</component-multistudy>
 	    <component-impltype>1</component-impltype>