diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index e898f4173..0be428f07 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -7,7 +7,7 @@ package chroot
 import (
 	"errors"
 	"fmt"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 ab2ddb708..6c5f06c57 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 0b89cf642..e5e8e43cf 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 cb694cc07..ca991e130 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/mitchellh/goamz/aws"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/aws"
+	"github.com/CpuID/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 cb52b646c..e4d5a7b1d 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 e065da2df..c5c92d772 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 32ca5fd9c..c2b5022df 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 1690869d0..5fbf66173 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/mitchellh/goamz/aws"
+	"github.com/CpuID/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 50e831c9d..58b1aacf0 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/mitchellh/goamz/aws"
+	"github.com/CpuID/goamz/aws"
 	"github.com/mitchellh/packer/packer"
 )
 
diff --git a/builder/amazon/common/artifact.go b/builder/amazon/common/artifact.go
index 3913833d7..c85b7f50d 100644
--- a/builder/amazon/common/artifact.go
+++ b/builder/amazon/common/artifact.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/mitchellh/goamz/aws"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/aws"
+	"github.com/CpuID/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 08f07e269..81d7ee3e2 100644
--- a/builder/amazon/common/block_device.go
+++ b/builder/amazon/common/block_device.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/ec2"
 )
 
 // BlockDevice
diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go
index 2e671e3d6..a66ae0f84 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/ec2"
 	"reflect"
 	"testing"
 )
diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index d8b195b43..45b91422a 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -22,7 +22,7 @@ type RunConfig struct {
 	SecurityGroupId          string   `mapstructure:"security_group_id"`
 	SecurityGroupIds         []string `mapstructure:"security_group_ids"`
 	SubnetId                 string   `mapstructure:"subnet_id"`
-	AssociatePublicIpAddress bool     `mapstructure:"associate_public_ip_address"`
+	AssociatePublicIpAddress string   `mapstructure:"associate_public_ip_address"`
 	TemporaryKeyPairName     string   `mapstructure:"temporary_key_pair_name"`
 	VpcId                    string   `mapstructure:"vpc_id"`
 	AvailabilityZone         string   `mapstructure:"availability_zone"`
diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go
index 5e7d8872d..9b5651c45 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 eaa29e92d..16730b3eb 100644
--- a/builder/amazon/common/state.go
+++ b/builder/amazon/common/state.go
@@ -3,7 +3,7 @@ package common
 import (
 	"errors"
 	"fmt"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 5ee486522..c4b0dfe11 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/mitchellh/goamz/aws"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/aws"
+	"github.com/CpuID/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 a204ca321..907fb75b9 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/mitchellh/goamz/aws"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/aws"
+	"github.com/CpuID/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 93ef6625d..42b7235b5 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 533d4cfd9..bd699446e 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/mitchellh/goamz/aws"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/aws"
+	"github.com/CpuID/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 a122318c4..4faf5f547 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"io/ioutil"
@@ -18,7 +18,7 @@ type StepRunSourceInstance struct {
 	SourceAMI                string
 	IamInstanceProfile       string
 	SubnetId                 string
-	AssociatePublicIpAddress bool
+	AssociatePublicIpAddress string
 	AvailabilityZone         string
 	BlockDevices             BlockDevices
 
diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go
index 28eb3134c..c95c877b6 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 e58392f84..88730c050 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -7,7 +7,7 @@ package ebs
 
 import (
 	"fmt"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 9dea11317..941d19c3c 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 058c61983..2b72a1d94 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 bb655e629..144cca46a 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -5,7 +5,7 @@ package instance
 import (
 	"errors"
 	"fmt"
-	"github.com/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 4dfbd4fc4..b13c2f3f0 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/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 35f31882d..1d12ace3c 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/mitchellh/goamz/ec2"
+	"github.com/CpuID/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"