diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index 0be428f07..e898f4173 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -7,7 +7,7 @@ package chroot
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/common"
diff --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go
index 6c5f06c57..ab2ddb708 100644
--- a/builder/amazon/chroot/step_attach_volume.go
+++ b/builder/amazon/chroot/step_attach_volume.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go
index e5e8e43cf..0b89cf642 100644
--- a/builder/amazon/chroot/step_create_volume.go
+++ b/builder/amazon/chroot/step_create_volume.go
@@ -2,7 +2,7 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go
index ca991e130..cb694cc07 100644
--- a/builder/amazon/chroot/step_instance_info.go
+++ b/builder/amazon/chroot/step_instance_info.go
@@ -2,8 +2,8 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"log"
diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go
index e4d5a7b1d..cb52b646c 100644
--- a/builder/amazon/chroot/step_register_ami.go
+++ b/builder/amazon/chroot/step_register_ami.go
@@ -2,7 +2,7 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go
index c5c92d772..e065da2df 100644
--- a/builder/amazon/chroot/step_snapshot.go
+++ b/builder/amazon/chroot/step_snapshot.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazon/chroot/step_source_ami_info.go b/builder/amazon/chroot/step_source_ami_info.go
index c2b5022df..32ca5fd9c 100644
--- a/builder/amazon/chroot/step_source_ami_info.go
+++ b/builder/amazon/chroot/step_source_ami_info.go
@@ -2,7 +2,7 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )
diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go
index 5fbf66173..1690869d0 100644
--- a/builder/amazon/common/access_config.go
+++ b/builder/amazon/common/access_config.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
+	"github.com/mitchellh/goamz/aws"
 	"github.com/mitchellh/packer/packer"
 	"strings"
 	"unicode"
diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go
index 58b1aacf0..50e831c9d 100644
--- a/builder/amazon/common/ami_config.go
+++ b/builder/amazon/common/ami_config.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
+	"github.com/mitchellh/goamz/aws"
 	"github.com/mitchellh/packer/packer"
 )
 
diff --git a/builder/amazon/common/artifact.go b/builder/amazon/common/artifact.go
index c85b7f50d..3913833d7 100644
--- a/builder/amazon/common/artifact.go
+++ b/builder/amazon/common/artifact.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/packer/packer"
 	"log"
 	"strings"
diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go
index 81d7ee3e2..08f07e269 100644
--- a/builder/amazon/common/block_device.go
+++ b/builder/amazon/common/block_device.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 )
 
 // BlockDevice
diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go
index a66ae0f84..2e671e3d6 100644
--- a/builder/amazon/common/block_device_test.go
+++ b/builder/amazon/common/block_device_test.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"reflect"
 	"testing"
 )
diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go
index 9b5651c45..5e7d8872d 100644
--- a/builder/amazon/common/ssh.go
+++ b/builder/amazon/common/ssh.go
@@ -4,7 +4,7 @@ import (
 	gossh "code.google.com/p/go.crypto/ssh"
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/communicator/ssh"
 	"time"
diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go
index 16730b3eb..eaa29e92d 100644
--- a/builder/amazon/common/state.go
+++ b/builder/amazon/common/state.go
@@ -3,7 +3,7 @@ package common
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"log"
 	"time"
diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go
index c4b0dfe11..5ee486522 100644
--- a/builder/amazon/common/step_ami_region_copy.go
+++ b/builder/amazon/common/step_ami_region_copy.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )
diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go
index 907fb75b9..a204ca321 100644
--- a/builder/amazon/common/step_create_tags.go
+++ b/builder/amazon/common/step_create_tags.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )
diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go
index 42b7235b5..93ef6625d 100644
--- a/builder/amazon/common/step_key_pair.go
+++ b/builder/amazon/common/step_key_pair.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"os"
diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go
index bd699446e..533d4cfd9 100644
--- a/builder/amazon/common/step_modify_ami_attributes.go
+++ b/builder/amazon/common/step_modify_ami_attributes.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )
diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index 4faf5f547..0b5fccb3c 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"io/ioutil"
diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go
index c95c877b6..28eb3134c 100644
--- a/builder/amazon/common/step_security_group.go
+++ b/builder/amazon/common/step_security_group.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/common/uuid"
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index 88730c050..e58392f84 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -7,7 +7,7 @@ package ebs
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/common"
diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go
index 941d19c3c..9dea11317 100644
--- a/builder/amazon/ebs/step_create_ami.go
+++ b/builder/amazon/ebs/step_create_ami.go
@@ -2,7 +2,7 @@ package ebs
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazon/ebs/step_stop_instance.go b/builder/amazon/ebs/step_stop_instance.go
index 2b72a1d94..058c61983 100644
--- a/builder/amazon/ebs/step_stop_instance.go
+++ b/builder/amazon/ebs/step_stop_instance.go
@@ -2,7 +2,7 @@ package ebs
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go
index 144cca46a..bb655e629 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -5,7 +5,7 @@ package instance
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/common"
diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go
index b13c2f3f0..4dfbd4fc4 100644
--- a/builder/amazon/instance/step_bundle_volume.go
+++ b/builder/amazon/instance/step_bundle_volume.go
@@ -2,7 +2,7 @@ package instance
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )
diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go
index 1d12ace3c..35f31882d 100644
--- a/builder/amazon/instance/step_register_ami.go
+++ b/builder/amazon/instance/step_register_ami.go
@@ -2,7 +2,7 @@ package instance
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"