diff --git a/docs/build/secrets.md b/docs/build/secrets.md
index a31733882..ad16f4d5d 100644
--- a/docs/build/secrets.md
+++ b/docs/build/secrets.md
@@ -1,6 +1,6 @@
 # Secret Variables
 
-> **Caution:** this feature is still considered experimental
+> this feature is still considered experimental
 
 Drone allows you to store secret variables in an encrypted `.drone.sec` file in the root of your repository. This is useful when your build requires sensitive information that should not be stored in plaintext in your `.drone.yml` file.
 
diff --git a/docs/setup/install.md b/docs/setup/install.md
index fc140d45e..4e7883805 100644
--- a/docs/setup/install.md
+++ b/docs/setup/install.md
@@ -1,5 +1,3 @@
-> **NOTE** we are not yet producing an image for 0.4 so this section does not work as documented. An official image for the 0.4 release is coming soon
-
 # Installation
 
 To quickly tryout Drone we have a [Docker image](https://registry.hub.docker.com/u/drone/drone/) that includes everything you need to get started. Simply run the commend below:
@@ -8,7 +6,7 @@ To quickly tryout Drone we have a [Docker image](https://registry.hub.docker.com
 sudo docker run \
 	--volume /var/lib/drone:/var/lib/drone \
 	--volume /var/run/docker.sock:/var/run/docker.sock \
-	--env-file /etc/defaults/drone \
+	--env-file /etc/drone/dronerc \
 	--restart=always \
 	--publish=80:8000 \
 	--detach=true \
diff --git a/docs/setup/mysql.md b/docs/setup/mysql.md
index 07eae30ca..a7fcde3b6 100644
--- a/docs/setup/mysql.md
+++ b/docs/setup/mysql.md
@@ -1,4 +1,4 @@
-> **Caution** the mysql driver has known timeout issues. See [#257](https://github.com/go-sql-driver/mysql/issues/257).
+> mysql driver has known timeout issues. See [#257](https://github.com/go-sql-driver/mysql/issues/257).
 
 # MySQL
 
diff --git a/engine/engine.go b/engine/engine.go
index c0524332e..3923b4ac4 100644
--- a/engine/engine.go
+++ b/engine/engine.go
@@ -70,14 +70,12 @@ func Load(db *sql.DB, env envconfig.Env, remote remote.Remote) Engine {
 
 	// quick fix to propogate HTTP_PROXY variables
 	// throughout the build environment.
-	if env := env.Get("HTTP_PROXY"); len(env) != 0 {
-		engine.envs = append(engine.envs, "HTTP_PROXY="+env)
-	}
-	if env := env.Get("HTTPS_PROXY"); len(env) != 0 {
-		engine.envs = append(engine.envs, "HTTPS_PROXY="+env)
-	}
-	if env := env.Get("NO_PROXY"); len(env) != 0 {
-		engine.envs = append(engine.envs, "NO_PROXY="+env)
+	var proxyVars = []string{"HTTP_PROXY", "http_proxy", "HTTPS_PROXY", "https_proxy", "NO_PROXY", "no_proxy"}
+	for _, proxyVar := range proxyVars {
+		proxyVal := env.Get(proxyVar)
+		if len(proxyVal) != 0 {
+			engine.envs = append(engine.envs, proxyVar+"="+proxyVal)
+		}
 	}
 
 	nodes, err := model.GetNodeList(db)