diff --git a/requirements-agent.txt b/requirements-agent.txt
new file mode 100644
index 0000000..051e068
--- /dev/null
+++ b/requirements-agent.txt
@@ -0,0 +1,15 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+pbr>=0.6,!=0.7,<1.0
+
+oslo.concurrency>=1.4.1         # Apache-2.0
+oslo.config>=1.6.0  # Apache-2.0
+oslo.i18n>=1.3.0  # Apache-2.0
+oslo.log>=0.4.0  # Apache-2.0
+oslo.serialization>=1.2.0               # Apache-2.0
+oslo.utils>=1.2.0                       # Apache-2.0
+psutil>=1.1.1,<2.0.0
+PyYAML>=3.1.0
+pyzmq>=14.3.1 # LGPL+BSD
diff --git a/setup-agent.cfg b/setup-agent.cfg
new file mode 100644
index 0000000..5e6c02e
--- /dev/null
+++ b/setup-agent.cfg
@@ -0,0 +1,27 @@
+[metadata]
+name = pyshaker-agent
+summary = Shaker Agent
+description-file =
+    README.rst
+author = OpenStack
+author-email = openstack-dev@lists.openstack.org
+home-page = http://www.openstack.org/
+classifier =
+    Environment :: OpenStack
+    Intended Audience :: Developers
+    Intended Audience :: Information Technology
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+
+[files]
+packages =
+    shaker
+
+[entry_points]
+console_scripts =
+    shaker-agent = shaker.agent.agent:main
diff --git a/tools/build_agent_pkg.sh b/tools/build_agent_pkg.sh
new file mode 100755
index 0000000..49375fa
--- /dev/null
+++ b/tools/build_agent_pkg.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+TEMP_DIR="$(mktemp -d)"
+cp -r shaker ${TEMP_DIR}/
+cp requirements-agent.txt ${TEMP_DIR}/requirements.txt
+cp setup-agent.cfg ${TEMP_DIR}/setup.cfg
+cp setup.py ${TEMP_DIR}/
+cp README.rst ${TEMP_DIR}/
+cp LICENSE ${TEMP_DIR}/
+
+export PBR_VERSION="$(git describe --exact-match)"
+
+cd ${TEMP_DIR}
+echo "Building pyshaker-agent version ${PBR_VERSION}"
+python setup.py sdist upload
+
+cd -
+rm -rf ${TEMP_DIR}