diff --git a/debian/services/lib.sh b/debian/services/lib.sh
index 9d24bdade3599cde9f981504ad4091bc26f5870e..f991af9739e3327219d7f046c62fc6c96bb2eaf4 100644
--- a/debian/services/lib.sh
+++ b/debian/services/lib.sh
@@ -49,6 +49,6 @@ set_interface() {
 set_etcd_params() {
     local default_etcd_server="etcd.${DOMAIN}"
     ETCD_SERVER="${ETCD_SERVER:-${default_etcd_server}}"
-    local server_ips=$(commaseplist localhost:4001 $(resolveall ${ETCD_SERVER} 4001))
+    local server_ips=$(commaseplist localhost:2379 $(resolveall ${ETCD_SERVER} 2379))
     ETCD_OPTIONS="${ETCD_OPTIONS} --etcd-servers=${server_ips}"
 }
diff --git a/etcd_client.go b/etcd_client.go
index bb687062a655058d038cc26c21a7d5b302529092..0026506bb20db04011bd52e97a827fa74666c508 100644
--- a/etcd_client.go
+++ b/etcd_client.go
@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	etcdMachines = flag.String("etcd-servers", "localhost:4001", "Etcd servers (comma-separated list)")
+	etcdMachines = flag.String("etcd-servers", "localhost:2379", "Etcd servers (comma-separated list)")
 	etcdCertFile = flag.String("etcd-cert", "", "SSL certificate for etcd client")
 	etcdKeyFile  = flag.String("etcd-key", "", "SSL private key for etcd client")
 	etcdCaFile   = flag.String("etcd-ca", "", "SSL CA certificate for etcd client")