diff --git a/config.go b/config.go
index 9ae88948..254cb3eb 100644
--- a/config.go
+++ b/config.go
@@ -7,11 +7,10 @@ import (
 	"net/http"
 	"os"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"golang.org/x/oauth2/jwt"
+	"google.golang.org/api/compute/v1"
 )
 
 // Config is the configuration structure used to instantiate the Google
diff --git a/disk_type.go b/disk_type.go
index dfea866d..1653337b 100644
--- a/disk_type.go
+++ b/disk_type.go
@@ -1,7 +1,7 @@
 package google
 
 import (
-	"code.google.com/p/google-api-go-client/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 // readDiskType finds the disk type with the given name.
diff --git a/operation.go b/operation.go
index 32bf79a5..b1f2f255 100644
--- a/operation.go
+++ b/operation.go
@@ -4,7 +4,8 @@ import (
 	"bytes"
 	"fmt"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
+	"google.golang.org/api/compute/v1"
+
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
diff --git a/resource_compute_address.go b/resource_compute_address.go
index d67ceb19..9bb9547f 100644
--- a/resource_compute_address.go
+++ b/resource_compute_address.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeAddress() *schema.Resource {
diff --git a/resource_compute_address_test.go b/resource_compute_address_test.go
index ba87169d..90988bb2 100644
--- a/resource_compute_address_test.go
+++ b/resource_compute_address_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccComputeAddress_basic(t *testing.T) {
diff --git a/resource_compute_disk.go b/resource_compute_disk.go
index 72457b9a..56b7ed25 100644
--- a/resource_compute_disk.go
+++ b/resource_compute_disk.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeDisk() *schema.Resource {
diff --git a/resource_compute_disk_test.go b/resource_compute_disk_test.go
index f99d9ed6..659affff 100644
--- a/resource_compute_disk_test.go
+++ b/resource_compute_disk_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccComputeDisk_basic(t *testing.T) {
diff --git a/resource_compute_firewall.go b/resource_compute_firewall.go
index 09d9ca25..2a2433a8 100644
--- a/resource_compute_firewall.go
+++ b/resource_compute_firewall.go
@@ -6,10 +6,10 @@ import (
 	"sort"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeFirewall() *schema.Resource {
diff --git a/resource_compute_firewall_test.go b/resource_compute_firewall_test.go
index 9bb92af2..a4a489fb 100644
--- a/resource_compute_firewall_test.go
+++ b/resource_compute_firewall_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccComputeFirewall_basic(t *testing.T) {
diff --git a/resource_compute_forwarding_rule.go b/resource_compute_forwarding_rule.go
index e8737434..8138ead8 100644
--- a/resource_compute_forwarding_rule.go
+++ b/resource_compute_forwarding_rule.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeForwardingRule() *schema.Resource {
diff --git a/resource_compute_http_health_check.go b/resource_compute_http_health_check.go
index 68a4c134..7f059b86 100644
--- a/resource_compute_http_health_check.go
+++ b/resource_compute_http_health_check.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeHttpHealthCheck() *schema.Resource {
diff --git a/resource_compute_instance.go b/resource_compute_instance.go
index 3b3e86de..803bb277 100644
--- a/resource_compute_instance.go
+++ b/resource_compute_instance.go
@@ -5,10 +5,10 @@ import (
 	"log"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeInstance() *schema.Resource {
diff --git a/resource_compute_instance_template.go b/resource_compute_instance_template.go
index 074e4569..249b9818 100644
--- a/resource_compute_instance_template.go
+++ b/resource_compute_instance_template.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeInstanceTemplate() *schema.Resource {
diff --git a/resource_compute_instance_template_test.go b/resource_compute_instance_template_test.go
index 74133089..d3e696ec 100644
--- a/resource_compute_instance_template_test.go
+++ b/resource_compute_instance_template_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccComputeInstanceTemplate_basic(t *testing.T) {
diff --git a/resource_compute_instance_test.go b/resource_compute_instance_test.go
index 9d16db52..9c53fae0 100644
--- a/resource_compute_instance_test.go
+++ b/resource_compute_instance_test.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"testing"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccComputeInstance_basic_deprecated_network(t *testing.T) {
diff --git a/resource_compute_network.go b/resource_compute_network.go
index 4254da72..5e581eff 100644
--- a/resource_compute_network.go
+++ b/resource_compute_network.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeNetwork() *schema.Resource {
diff --git a/resource_compute_network_test.go b/resource_compute_network_test.go
index ea25b0ff..89827f57 100644
--- a/resource_compute_network_test.go
+++ b/resource_compute_network_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccComputeNetwork_basic(t *testing.T) {
diff --git a/resource_compute_route.go b/resource_compute_route.go
index 02aa7265..aec9e8d3 100644
--- a/resource_compute_route.go
+++ b/resource_compute_route.go
@@ -5,10 +5,10 @@ import (
 	"log"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeRoute() *schema.Resource {
diff --git a/resource_compute_route_test.go b/resource_compute_route_test.go
index 065842f8..e4b8627e 100644
--- a/resource_compute_route_test.go
+++ b/resource_compute_route_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/compute/v1"
 )
 
 func TestAccComputeRoute_basic(t *testing.T) {
diff --git a/resource_compute_target_pool.go b/resource_compute_target_pool.go
index 98935b84..83611e2b 100644
--- a/resource_compute_target_pool.go
+++ b/resource_compute_target_pool.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/google-api-go-client/compute/v1"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"github.com/hashicorp/terraform/helper/schema"
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeTargetPool() *schema.Resource {