diff --git a/.gitreview b/.gitreview
index 7edad107..bda30019 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/savanna-ci-config.git
+project=stackforge/sahara-ci-config.git
diff --git a/README.rst b/README.rst
new file mode 100644
index 00000000..e69de29b
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..30c9d310
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+pbr>=0.6,<1.0
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..ff037264
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,25 @@
+[metadata]
+name = sahara-ci-config
+summary = Sahara CI config
+description-file = README.rst
+license = Apache Software License
+classifiers =
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Environment :: OpenStack
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+author = Mirantis
+author-email = sahara-all@mirantis.com
+home-page = http://sahara-ci-config.rtfd.org/
+
+[global]
+setup-hooks = pbr.hooks.setup_hook
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..70c2b3f3
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
+
+setuptools.setup(
+    setup_requires=['pbr'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..a19a9e3e
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+hacking>=0.8.0,<0.9
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..358d1811
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,33 @@
+[tox]
+envlist = py27,pep8
+minversion = 1.6
+skipsdist = True
+
+[testenv]
+usedevelop = True
+install_command = pip install -U {opts} {packages}
+setenv =
+    VIRTUAL_ENV={envdir}
+    DISCOVER_DIRECTORY=sahara/tests/unit
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
+#commands = python setup.py test --slowest --testr-args="{posargs}"
+
+[testenv:pep8]
+#commands =
+#    flake8 {posargs}
+
+[testenv:venv]
+commands = {posargs}
+
+[testenv:docs]
+commands =
+    rm -rf doc/html doc/build
+    rm -rf doc/source/apidoc doc/source/api
+    python setup.py build_sphinx
+
+[flake8]
+show-source = true
+builtins = _
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools