diff --git a/Documentation/cloud-config.md b/Documentation/cloud-config.md
index 79f93f9..f08d795 100644
--- a/Documentation/cloud-config.md
+++ b/Documentation/cloud-config.md
@@ -109,7 +109,7 @@ flanneld. For example, the following cloud-config...
 
 coreos:
   flannel:
-      etcd-prefix: /coreos.com/network2
+      etcd_prefix: /coreos.com/network2
 ```
 
 ...will generate a systemd unit drop-in like so:
@@ -119,7 +119,15 @@ coreos:
 Environment="FLANNELD_ETCD_PREFIX=/coreos.com/network2"
 ```
 
-For the complete list of flannel configuraion parameters, see the [flannel documentation][flannel-readme].
+List of flannel configuration parameters:
+- **etcd_endpoints**: Comma separated list of etcd endpoints
+- **etcd_cafile**: Path to CA file used for TLS communication with etcd
+- **etcd_certfile**: Path to certificate file used for TLS communication with etcd
+- **etcd_keyfile**: Path to private key file used for TLS communication with etcd
+- **etcd_prefix**: Etcd prefix path to be used for flannel keys
+- **ip_masq**: Install IP masquerade rules for traffic outside of flannel subnet
+- **subnet_file**: Path to flannel subnet file to write out
+- **interface**: Interface (name or IP) that should be used for inter-host communication
 
 [flannel-readme]: https://github.com/coreos/flannel/blob/master/README.md
 
diff --git a/config/flannel.go b/config/flannel.go
index d7f4d0d..bc8af2d 100644
--- a/config/flannel.go
+++ b/config/flannel.go
@@ -1,9 +1,12 @@
 package config
 
 type Flannel struct {
-	EtcdEndpoint string `yaml:"etcd_endpoint" env:"FLANNELD_ETCD_ENDPOINT"`
-	EtcdPrefix   string `yaml:"etcd_prefix"   env:"FLANNELD_ETCD_PREFIX"`
-	IPMasq       string `yaml:"ip_masq"       env:"FLANNELD_IP_MASQ"`
-	SubnetFile   string `yaml:"subnet_file"   env:"FLANNELD_SUBNET_FILE"`
-	Iface        string `yaml:"interface"     env:"FLANNELD_IFACE"`
+	EtcdEndpoints string `yaml:"etcd_endpoints" env:"FLANNELD_ETCD_ENDPOINTS"`
+	EtcdCAFile    string `yaml:"etcd_cafile"    env:"FLANNELD_ETCD_CAFILE"`
+	EtcdCertFile  string `yaml:"etcd_certfile"  env:"FLANNELD_ETCD_CERTFILE"`
+	EtcdKeyFile   string `yaml:"etcd_keyfile"   env:"FLANNELD_ETCD_KEYFILE"`
+	EtcdPrefix    string `yaml:"etcd_prefix"    env:"FLANNELD_ETCD_PREFIX"`
+	IPMasq        string `yaml:"ip_masq"        env:"FLANNELD_IP_MASQ"`
+	SubnetFile    string `yaml:"subnet_file"    env:"FLANNELD_SUBNET_FILE"`
+	Iface         string `yaml:"interface"      env:"FLANNELD_IFACE"`
 }
diff --git a/system/flannel_test.go b/system/flannel_test.go
index 4eec6b9..7531e80 100644
--- a/system/flannel_test.go
+++ b/system/flannel_test.go
@@ -18,10 +18,10 @@ func TestFlannelEnvVars(t *testing.T) {
 		},
 		{
 			config.Flannel{
-				EtcdEndpoint: "http://12.34.56.78:4001",
-				EtcdPrefix:   "/coreos.com/network/tenant1",
+				EtcdEndpoints: "http://12.34.56.78:4001",
+				EtcdPrefix:    "/coreos.com/network/tenant1",
 			},
-			`FLANNELD_ETCD_ENDPOINT=http://12.34.56.78:4001
+			`FLANNELD_ETCD_ENDPOINTS=http://12.34.56.78:4001
 FLANNELD_ETCD_PREFIX=/coreos.com/network/tenant1`,
 		},
 	} {
@@ -43,13 +43,13 @@ func TestFlannelFile(t *testing.T) {
 		},
 		{
 			config.Flannel{
-				EtcdEndpoint: "http://12.34.56.78:4001",
-				EtcdPrefix:   "/coreos.com/network/tenant1",
+				EtcdEndpoints: "http://12.34.56.78:4001",
+				EtcdPrefix:    "/coreos.com/network/tenant1",
 			},
 			&File{config.File{
 				Path:               "run/flannel/options.env",
 				RawFilePermissions: "0644",
-				Content: `FLANNELD_ETCD_ENDPOINT=http://12.34.56.78:4001
+				Content: `FLANNELD_ETCD_ENDPOINTS=http://12.34.56.78:4001
 FLANNELD_ETCD_PREFIX=/coreos.com/network/tenant1`,
 			}},
 		},