diff --git a/docker.go b/docker.go
index ae2d5903c..70a162702 100644
--- a/docker.go
+++ b/docker.go
@@ -82,9 +82,11 @@ func (provider *DockerProvider) loadDockerConfig() *Configuration {
 	containersInspected := []docker.Container{}
 	hosts := map[string][]docker.Container{}
 	for _, container := range containerList {
-		containerInspected, _ := provider.dockerClient.InspectContainer(container.ID)
-		containersInspected = append(containersInspected, *containerInspected)
-		hosts[getHost(*containerInspected)] = append(hosts[getHost(*containerInspected)], *containerInspected)
+		if(container.Labels["traefik.enable"] != "false"){
+			containerInspected, _ := provider.dockerClient.InspectContainer(container.ID)
+			containersInspected = append(containersInspected, *containerInspected)
+			hosts[getHost(*containerInspected)] = append(hosts[getHost(*containerInspected)], *containerInspected)
+		}
 	}
 
 	templateObjects := struct {
diff --git a/traefik.toml b/traefik.toml
index 8020cfd82..c9ef0fa92 100644
--- a/traefik.toml
+++ b/traefik.toml
@@ -1,18 +1,18 @@
 port = ":8001"
 graceTimeOut = 10
 
-# [docker]
-# endpoint = "unix:///var/run/docker.sock"
-# watch = true
-# domain = "toto.fr"
-# filename = "docker.tmpl"
-
-[marathon]
-endpoint = "http://127.0.0.1:8080"
-networkInterface = "eth0"
+[docker]
+endpoint = "unix:///var/run/docker.sock"
 watch = true
 domain = "toto.fr"
-filename = "marathon.tmpl"
+filename = "docker.tmpl"
+
+# [marathon]
+# endpoint = "http://127.0.0.1:8080"
+# networkInterface = "eth0"
+# watch = true
+# domain = "toto.fr"
+# filename = "marathon.tmpl"
 
 [web]
 address = ":8010"