diff --git a/doc/conf.py b/doc/conf.py
index fd8aaf9b584e567715d19f2a3140eafbfa1af5d1..4702002f17b745fe0ec6aee5b0e4eec7401bd45c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -19,6 +19,7 @@
 #
 import os
 import sys
+from ess import __version__
 sys.path.insert(0, os.path.abspath('../'))
 
 # -- General configuration ------------------------------------------------
@@ -67,9 +68,9 @@ author = 'Ryoichi Miyamoto, Yngve Levinsen, Mamad Eshraqi'
 # built documents.
 #
 # The short X.Y version.
-version = '2'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '2.2'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ess/__init__.py b/ess/__init__.py
index a6d9497803bc95223f3c361e266a10e69306d94d..ab1974321918c68446d59f4bd0e2a05d64716471 100644
--- a/ess/__init__.py
+++ b/ess/__init__.py
@@ -1,4 +1,5 @@
 __all__ = ["fieldmap", "installed", "lib_tw", "SP_Relativity", "TraceWin" "TTF"]
+__version__ = '2.2'
 from . import TraceWin
 from . import installed
 from . import lib_tw
diff --git a/setup.py b/setup.py
index 35aa685ac2908f9455968cd1eba3ac6a3cbf6bf1..f2cbcb3b6a2a871fe9d6745e95a880715d801105 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,8 @@
 from distutils.core import setup
+from ess import __version__
 
 setup(name='ESS Python Tools',
-    version='2.2',
+    version=__version__,
     description='ESS Related Tools for Python',
     url='http://ess-bp.pages.esss.lu.se/ess-python-tools',
     author='Yngve Levinsen',