diff --git a/FofbTool/__init__.py b/FofbTool/__init__.py
index 27ab57e27ce423c4617052fdfc6328fd7cc428b4..234c9555f7979978ca36b3d104628e1b5bc3c332 100644
--- a/FofbTool/__init__.py
+++ b/FofbTool/__init__.py
@@ -14,4 +14,4 @@ This package is cut in several modules:
 For basic usage, see doc of FofbTool.Utils
 
 """
-__version__ = "2.2"
+from FofbTool._version import version as __version__
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..46dce0a9e9b55bc1a8ddb15efcc2a4791e4d5f82
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+
+
+VERSION:
+	echo version=\'$(shell git describe --tags | sed 's/\(.*\)-.*/\1/')\' > FofbTool/_version.py
+
+
+clean:
+	rm -f FofbTool/_version.py
diff --git a/setup.py b/setup.py
index 75fdb54016753c93b25fa9a456db2d60917d900e..cd350db7084a980ec499c8579fc8141e881cbf11 100755
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
+from FofbTool._version import version
 
 setup(name='FofbTool',
-      version='2.2',
+      version=version,
       description='Python module to operate and configure SOLEIL FOFB.',
       url='https://gitlab.synchrotron-soleil.fr/dg/fofb/fofbtool',
       license="GNU-GPL-v3",