diff --git a/dockerd/dockerd.go b/dockerd/dockerd.go
new file mode 100644
index 000000000..744964cf7
--- /dev/null
+++ b/dockerd/dockerd.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"log"
+	"flag"
+	"github.com/dotcloud/docker/server"
+	"github.com/dotcloud/docker"
+)
+
+func main() {
+	if docker.SelfPath() == "/sbin/init" {
+		// Running in init mode
+		docker.SysInit()
+		return
+	}
+	flag.Parse()
+	d, err := server.New()
+	if err != nil {
+		log.Fatal(err)
+	}
+	if err := d.ListenAndServe(); err != nil {
+		log.Fatal(err)
+	}
+}