diff --git a/builder/amazonebs/builder.go b/builder/amazonebs/builder.go
index ce17a646f..8822a78fb 100644
--- a/builder/amazonebs/builder.go
+++ b/builder/amazonebs/builder.go
@@ -58,10 +58,18 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		}
 	}
 
+	if b.config.AccessKey == "" {
+		b.config.AccessKey = os.Getenv("AWS_ACCESS_KEY_ID")
+	}
+
 	if b.config.AccessKey == "" {
 		b.config.AccessKey = os.Getenv("AWS_ACCESS_KEY")
 	}
 
+	if b.config.SecretKey == "" {
+		b.config.SecretKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
+	}
+
 	if b.config.SecretKey == "" {
 		b.config.SecretKey = os.Getenv("AWS_SECRET_KEY")
 	}