diff --git a/tangostationcontrol/requirements.txt b/tangostationcontrol/requirements.txt
index a177d8feb442896426811285c362683c0fde76c9..dbcf275517794f9ae19d2c311f954bb8a24777d0 100644
--- a/tangostationcontrol/requirements.txt
+++ b/tangostationcontrol/requirements.txt
@@ -2,5 +2,6 @@
 # order of appearance. Changing the order has an impact on the overall
 # integration process, which may cause wedges in the gate later.
 
+pbr >= 2
 GitPython >= 3.1.24 # BSD
 snmp>=0.1.7 # GPL3
diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg
index 828bd0d65693878b4fac2e6bde649226be3d4453..49c8848906502143b045cd5c6b81afad3b553702 100644
--- a/tangostationcontrol/setup.cfg
+++ b/tangostationcontrol/setup.cfg
@@ -1,6 +1,7 @@
 [metadata]
 name = tangostationcontrol
-version = attr: tangostationcontrol.__version__
+;version = attr: tangostationcontrol.__version__
+version = 0.0.1
 summary = LOFAR 2.0 Station Control
 description_file =
     README.md
@@ -25,6 +26,16 @@ classifier =
 [files]
 packages=tangostationcontrol
 
+;[options]
+;package_dir=
+;    =tangostationcontrol
+;packages=find:
+;
+;[options.packages.find]
+;where=tangostationcontrol
+;
+;[options.entry_points]
+
 [entry_points]
 console_scripts =
     l2ss-docker-device = tangostationcontrol.devices.docker_device:main
diff --git a/tangostationcontrol/setup.py b/tangostationcontrol/setup.py
index ab0d6867e5ec01699a8ebbaf4d67afa79f5674e0..d3ec3b44fa8631e968870dc49de1cd6c6b14f7c1 100644
--- a/tangostationcontrol/setup.py
+++ b/tangostationcontrol/setup.py
@@ -1,5 +1,5 @@
 import setuptools
 
 # Requires: setup.cfg
-# setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
-setuptools.setup()
+setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
+# setuptools.setup()
diff --git a/tangostationcontrol/tangostationcontrol/__init__.py b/tangostationcontrol/tangostationcontrol/__init__.py
index e7b28aa7e44ddc7c6e33cf4eb68183a1bc9a3ca8..11f6b43c10463260e829526bd0597e1bb094636e 100644
--- a/tangostationcontrol/tangostationcontrol/__init__.py
+++ b/tangostationcontrol/tangostationcontrol/__init__.py
@@ -1,3 +1,6 @@
-from tangostationcontrol.common.lofar_git import get_version
+# from tangostationcontrol.common.lofar_git import get_version
+#
+# __version__ = get_version()
 
-__version__ = get_version()
+import pbr.version
+__version__ = pbr.version.VersionInfo('tangostationcontrol').version_string()
diff --git a/tangostationcontrol/tangostationcontrol/version.py b/tangostationcontrol/tangostationcontrol/version.py
index 796edfbff723634e41e1ed284ba5062667c55f93..e31f88543a043d9ca87a4fbfc5f75d2682ca8e5f 100644
--- a/tangostationcontrol/tangostationcontrol/version.py
+++ b/tangostationcontrol/tangostationcontrol/version.py
@@ -1,3 +1,6 @@
-from tangostationcontrol.common.lofar_git import get_version
+# version = "v0.0.1"
 
-version_string = get_version()
+import pbr.version
+
+version_info = pbr.version.VersionInfo('python-watcher')
+version_string = version_info.version_string()
\ No newline at end of file