diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..4713b0a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+FROM progrium/busybox
+MAINTAINER Jeff Lindsay <progrium@gmail.com
+
+ADD ./stage/docksul /bin/docksul
+
+ENTRYPOINT ["/bin/docksul"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e69de29..05dbf13 100644
--- a/Makefile
+++ b/Makefile
@@ -0,0 +1,5 @@
+
+build:
+	mkdir -p stage
+	go build -o stage/docksul
+	docker build -t docksul .
\ No newline at end of file
diff --git a/docksul.go b/docksul.go
index fa36e5e..513a2c9 100644
--- a/docksul.go
+++ b/docksul.go
@@ -130,14 +130,14 @@ func (b *ContainerServiceBridge) Unlink(containerId string) {
 func main() {
 	flag.Parse()
 
-	dockerAddr := flag.Arg(0)
-	if dockerAddr == "" {
-		dockerAddr = "unix:///var/run/docker.sock"
-	}
-	consulAddr := flag.Arg(1)
+	consulAddr := flag.Arg(0)
 	if consulAddr == "" {
 		consulAddr = "http://0.0.0.0:8500"
 	}
+	dockerAddr := flag.Arg(1)
+	if dockerAddr == "" {
+		dockerAddr = "unix:///var/run/docker.sock"
+	}
 
 	client, err := docker.NewClient(dockerAddr)
 	assert(err)
@@ -151,9 +151,6 @@ func main() {
 	}
 
 	events := make(chan *docker.APIEvents)
-	// TODO: resolve this workaround. https://github.com/fsouza/go-dockerclient/issues/101
-	assert(client.AddEventListener(events))
-	assert(client.RemoveEventListener(events))
 	assert(client.AddEventListener(events))
 	for msg := range events {
 		debug("event:", msg.ID[:12], msg.Status)
diff --git a/stage/docksul b/stage/docksul
new file mode 100755
index 0000000..15c535a
Binary files /dev/null and b/stage/docksul differ