diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..ac805547080a87ddbeed3044edcecacce8f17583
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+#!/usr/bin/make
+PYTHON := /usr/bin/env python
+
+USER = csd-garr
+NAME = defaultgw
+
+publish: 
+	export OUTPUT=`charm push . cs:~$(USER)/$(NAME)`; echo $$OUTPUT
+	export REV=`echo $$OUTPUT | sed 's/.*$(NAME)-\([0-9]*\).*/\1/'`
+	charm release cs:~$(USER)/$(NAME)-$(REV) --channel stable
+	charm grant cs:~$(USER)/$(NAME)-$(REV) everyone --channel stable
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6a3271b078b3af5f2b3cff572172d78317acbe48
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,12 @@
+# 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>=1.8.0,<1.9.0
+PyYAML>=3.1.0
+simplejson>=2.2.0
+netifaces>=0.10.4
+netaddr>=0.7.12,!=0.7.16
+Jinja2>=2.6  # BSD License (3 clause)
+six>=1.9.0
+dnspython>=1.12.0
+psutil>=1.1.1,<2.0.0
diff --git a/revision b/revision
index 1e8b314962144c26d5e0e50fd29d2ca327864913..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-6
+7
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..382489493b1249590ed377ae2afaaecd5d6bdeb9
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,30 @@
+# 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.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
+charm-tools>=2.0.0
+requests==2.6.0
+# BEGIN: Amulet OpenStack Charm Helper Requirements
+# Liberty client lower constraints
+# The websocket-client issue should be resolved in the jujulib/theblues
+# Temporarily work around it
+websocket-client<=0.40.0
+amulet>=1.14.3,<2.0
+bundletester>=0.6.1,<1.0
+python-ceilometerclient>=1.5.0
+python-cinderclient>=1.4.0
+python-glanceclient>=1.1.0
+python-heatclient>=0.8.0
+python-keystoneclient>=1.7.1
+python-neutronclient>=3.1.0
+python-novaclient>=2.30.1
+python-openstackclient>=1.7.0
+python-swiftclient>=2.6.0
+pika>=0.10.0,<1.0
+distro-info
+# END: Amulet OpenStack Charm Helper Requirements
+# NOTE: workaround for 14.04 pip/tox
+pytz