diff --git a/cluster-autoscaler/Godeps/Godeps.json b/cluster-autoscaler/Godeps/Godeps.json
new file mode 100644
index 0000000000..47c484fb62
--- /dev/null
+++ b/cluster-autoscaler/Godeps/Godeps.json
@@ -0,0 +1,9 @@
+{
+	"ImportPath": "k8s.io/contrib/cluster-autoscaler",
+	"GoVersion": "go1.6",
+	"Packages": [
+		"./..."
+	],
+	"Deps": [
+	]
+}
diff --git a/cluster-autoscaler/Godeps/Readme b/cluster-autoscaler/Godeps/Readme
new file mode 100644
index 0000000000..4cdaa53d56
--- /dev/null
+++ b/cluster-autoscaler/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/cluster-autoscaler/Makefile b/cluster-autoscaler/Makefile
new file mode 100644
index 0000000000..6094b314c3
--- /dev/null
+++ b/cluster-autoscaler/Makefile
@@ -0,0 +1,21 @@
+all: build
+
+TAG = v0.0.1
+PREFIX = gcr.io/google_containers
+FLAGS = 
+ENVVAR=
+
+deps:
+	go get github.com/tools/godep
+
+build: clean deps
+	$(ENVVAR) godep go build ./...
+	$(ENVVAR) godep go build -o cluster-autoscaler 
+
+test-unit: clean deps build
+	$(ENVVAR) godep go test --test.short -race ./... $(FLAGS)
+
+clean:
+	rm -f clusterautoscaler
+
+.PHONY: all deps build test-unit clean
diff --git a/cluster-autoscaler/cluster_autoscaler.go b/cluster-autoscaler/cluster_autoscaler.go
new file mode 100644
index 0000000000..1885eb93ec
--- /dev/null
+++ b/cluster-autoscaler/cluster_autoscaler.go
@@ -0,0 +1,20 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+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.
+*/
+
+package main
+
+func main() {
+}