diff -Nru cloud-init-0.7.6~bzr1022/debian/changelog cloud-init-0.7.6~bzr1022/debian/changelog
--- cloud-init-0.7.6~bzr1022/debian/changelog	2014-10-01 14:27:45.000000000 -0600
+++ cloud-init-0.7.6~bzr1022/debian/changelog	2014-10-22 13:11:31.000000000 -0600
@@ -1,3 +1,10 @@
+cloud-init (0.7.6~bzr1022-0ubuntu2) utopic; urgency=medium
+
+  * d/patches/lp-1383794-gce-short_name.patch: use short hostname for GCE
+    (LP: #1383794).
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Tue, 21 Oct 2014 14:47:39 -0600
+
 cloud-init (0.7.6~bzr1022-0ubuntu1) utopic; urgency=medium
 
   * New upstream snapshot.
diff -Nru cloud-init-0.7.6~bzr1022/debian/patches/lp-1383794-gce-short_name.patch cloud-init-0.7.6~bzr1022/debian/patches/lp-1383794-gce-short_name.patch
--- cloud-init-0.7.6~bzr1022/debian/patches/lp-1383794-gce-short_name.patch	1969-12-31 17:00:00.000000000 -0700
+++ cloud-init-0.7.6~bzr1022/debian/patches/lp-1383794-gce-short_name.patch	2014-10-22 13:11:31.000000000 -0600
@@ -0,0 +1,37 @@
+Description: Use the shortname for GCE
+ GCE FDQN's may exceed 64 characters. A number of programs like Hadoop,
+ Easyrsa, Java, etc., have issues with long hostnames.
+Author: Ben Howard <ben.howard@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1383794
+--- cloud-init-0.7.6~bzr1022.orig/cloudinit/sources/DataSourceGCE.py
++++ cloud-init-0.7.6~bzr1022/cloudinit/sources/DataSourceGCE.py
+@@ -115,7 +115,8 @@ class DataSourceGCE(sources.DataSource):
+         return self.metadata['public-keys']
+ 
+     def get_hostname(self, fqdn=False, _resolve_ip=False):
+-        return self.metadata['local-hostname']
++        # GCE has long FDQN's and has asked for short hostnames
++        return self.metadata['local-hostname'].split('.')[0]
+ 
+     def get_userdata_raw(self):
+         return self.metadata['user-data']
+--- cloud-init-0.7.6~bzr1022.orig/tests/unittests/test_datasource/test_gce.py
++++ cloud-init-0.7.6~bzr1022/tests/unittests/test_datasource/test_gce.py
+@@ -82,7 +82,8 @@ class TestDataSourceGCE(test_helpers.Htt
+             body=_request_callback)
+         self.ds.get_data()
+ 
+-        self.assertEqual(GCE_META.get('instance/hostname'),
++        shostname = GCE_META.get('instance/hostname').split('.')[0]
++        self.assertEqual(shostname,
+                          self.ds.get_hostname())
+ 
+         self.assertEqual(GCE_META.get('instance/id'),
+@@ -109,5 +110,5 @@ class TestDataSourceGCE(test_helpers.Htt
+         self.assertEqual(GCE_META_PARTIAL.get('instance/id'),
+                          self.ds.get_instance_id())
+ 
+-        self.assertEqual(GCE_META_PARTIAL.get('instance/hostname'),
+-                         self.ds.get_hostname())
++        shostname = GCE_META_PARTIAL.get('instance/hostname').split('.')[0]
++        self.assertEqual(shostname, self.ds.get_hostname())
diff -Nru cloud-init-0.7.6~bzr1022/debian/patches/series cloud-init-0.7.6~bzr1022/debian/patches/series
--- cloud-init-0.7.6~bzr1022/debian/patches/series	1969-12-31 17:00:00.000000000 -0700
+++ cloud-init-0.7.6~bzr1022/debian/patches/series	2014-10-22 13:11:31.000000000 -0600
@@ -0,0 +1 @@
+lp-1383794-gce-short_name.patch