diff --git a/.gitignore b/.gitignore
index 686ac83428..3ef8361c92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ docker/docker
 .*.swp
 a.out
 *.orig
+build_src
diff --git a/Makefile b/Makefile
index a538f09508..dfb9702baa 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,9 @@ $(SOURCE_PACKAGE): $(BUILD_SRC)
 	tar -f $(SOURCE_PACKAGE) -C ${ROOT_PATH}/${BUILD_SRC} -cz .
 
 # Build deb package fetching go dependencies and cleaning up git repositories
-deb: $(SOURCE_PACKAGE)
+deb: $(DEB_PACKAGE)
+	
+$(DEB_PACKAGE): $(SOURCE_PACKAGE)
 	# dpkg-buildpackage looks for source package tarball in ../
 	cd $(BUILD_SRC); dpkg-buildpackage
 	rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files
diff --git a/deb/Makefile b/deb/Makefile
new file mode 120000
index 0000000000..d0b0e8e008
--- /dev/null
+++ b/deb/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/deb/README.md b/deb/README.md
new file mode 120000
index 0000000000..32d46ee883
--- /dev/null
+++ b/deb/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/debian/changelog b/deb/debian/changelog
similarity index 100%
rename from debian/changelog
rename to deb/debian/changelog
diff --git a/debian/compat b/deb/debian/compat
similarity index 100%
rename from debian/compat
rename to deb/debian/compat
diff --git a/debian/control b/deb/debian/control
similarity index 100%
rename from debian/control
rename to deb/debian/control
diff --git a/debian/copyright b/deb/debian/copyright
similarity index 100%
rename from debian/copyright
rename to deb/debian/copyright
diff --git a/debian/docs b/deb/debian/docs
similarity index 100%
rename from debian/docs
rename to deb/debian/docs
diff --git a/debian/rules b/deb/debian/rules
similarity index 100%
rename from debian/rules
rename to deb/debian/rules
diff --git a/debian/source/format b/deb/debian/source/format
similarity index 100%
rename from debian/source/format
rename to deb/debian/source/format
diff --git a/deb/etc/docker-dev.upstart b/deb/etc/docker-dev.upstart
new file mode 100644
index 0000000000..6cfe9d2616
--- /dev/null
+++ b/deb/etc/docker-dev.upstart
@@ -0,0 +1,10 @@
+description     "Run docker"
+
+start on runlevel [2345]
+stop on starting rc RUNLEVEL=[016]
+respawn
+
+script
+    test -f /etc/default/locale && . /etc/default/locale || true
+    LANG=$LANG LC_ALL=$LANG /usr/bin/docker -d
+end script