diff --git a/agents/gce/fence_gce.py b/agents/gce/fence_gce.py
index c1f8b16f..3abb5207 100644
--- a/agents/gce/fence_gce.py
+++ b/agents/gce/fence_gce.py
@@ -1,112 +1,114 @@
 #!@PYTHON@ -tt
 
 import atexit
 import sys
 sys.path.append("@FENCEAGENTSLIBDIR@")
 
-import googleapiclient
-import oauth2client
+import googleapiclient.discovery
 from fencing import fail_usage, run_delay, all_opt, atexit_handler, check_input, process_input, show_docs, fence_action
 
 def translate_status(instance_status):
 	"Returns on | off | unknown."
 	if instance_status == "RUNNING":
 		return "on"
 	elif instance_status == "TERMINATED":
 		return "off"
 	return "unknown"
 
 
 def get_nodes_list(conn, options):
 	result = {}
 	try:
 		instanceList = conn.instances().list(project=options["--project"], zone=options["--zone"]).execute()
 		for instance in instanceList["items"]:
 			result[instance["id"]] = (instance["name"], translate_status(instance["status"]))
 	except Exception as err:
 		fail_usage("Failed: get_nodes_list: {}".format(str(err)))
 
 	return result
 
 def get_power_status(conn, options):
 	try:
 		instance = conn.instances().get(
 				project=options["--project"],
 				zone=options["--zone"],
 				instance=options["--plug"]).execute()
 		return translate_status(instance["status"])
 	except Exception as err:
 		fail_usage("Failed: get_power_status: {}".format(str(err)))
 
 
 def set_power_status(conn, options):
 	try:
 		if options["--action"] == "off":
 			conn.instances().stop(
 					project=options["--project"],
 					zone=options["--zone"],
 					instance=options["--plug"]).execute()
 		elif options["--action"] == "on":
 			conn.instances().start(
 					project=options["--project"],
 					zone=options["--zone"],
 					instance=options["--plug"]).execute()
 	except Exception as err:
 		fail_usage("Failed: set_power_status: {}".format(str(err)))
 
 
 def define_new_opts():
 	all_opt["zone"] = {
 		"getopt" : ":",
 		"longopt" : "zone",
 		"help" : "--zone=[name]                  Zone, e.g. us-central1-b",
 		"shortdesc" : "Zone.",
 		"required" : "1",
 		"order" : 2
 	}
 	all_opt["project"] = {
 		"getopt" : ":",
 		"longopt" : "project",
 		"help" : "--project=[name]               Project ID",
 		"shortdesc" : "Project ID.",
 		"required" : "1",
 		"order" : 3
 	}
 
 def main():
 	conn = None
 
 	device_opt = ["port", "no_password", "zone", "project"]
 
 	atexit.register(atexit_handler)
 
 	define_new_opts()
 
 	all_opt["power_timeout"]["default"] = "60"
 
 	options = check_input(device_opt, process_input(device_opt))
 
 	docs = {}
 	docs["shortdesc"] = "Fence agent for GCE (Google Cloud Engine)"
 	docs["longdesc"] = "fence_gce is an I/O Fencing agent for GCE (Google Cloud " \
 			   "Engine). It uses the googleapiclient library to connect to GCE.\n" \
 			   "googleapiclient can be configured with Google SDK CLI or by " \
 			   "executing 'gcloud auth application-default login'.\n" \
 			   "For instructions see: https://cloud.google.com/compute/docs/tutorials/python-guide"
 	docs["vendorurl"] = "http://cloud.google.com"
 	show_docs(options, docs)
 
 	run_delay(options)
 
 	try:
-		credentials = oauth2client.GoogleCredentials.get_application_default()
+		credentials = None
+		if tuple(googleapiclient.__version__) < tuple("1.6.0"):
+			import oauth2client.client
+			credentials = oauth2client.client.GoogleCredentials.get_application_default()
 		conn = googleapiclient.discovery.build('compute', 'v1', credentials=credentials)
 	except Exception as err:
 		fail_usage("Failed: Create GCE compute v1 connection: {}".format(str(err)))
 
 	# Operate the fencing device
 	result = fence_action(conn, options, set_power_status, get_power_status, get_nodes_list)
 	sys.exit(result)
 
 if __name__ == "__main__":
 	main()