diff --git a/database.sql b/database.sql
index 9c43df3db3..1521293378 100644
--- a/database.sql
+++ b/database.sql
@@ -575,7 +575,7 @@ CREATE TABLE IF NOT EXISTS `attach` (
 
 CREATE TABLE IF NOT EXISTS `guid` (
 `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`guid` CHAR( 16 ) NOT NULL ,
+`guid` CHAR( 64 ) NOT NULL ,
 INDEX ( `guid` )
 ) ENGINE = MYISAM  DEFAULT CHARSET=utf8;
 
diff --git a/update.php b/update.php
index 0fafd11e3d..3c76a6bb4c 100644
--- a/update.php
+++ b/update.php
@@ -632,10 +632,14 @@ function update_1076() {
 }
 
 // There was a typo in 1076 so we'll try again in 1077 to make sure
+// We'll also make it big enough to allow for future growth, I seriously 
+// doubt Diaspora will be able to leave guids at 16 bytes,
+// and we can also use the same structure for our own larger guids
 
 function update_1077() {
 	q("CREATE TABLE IF NOT EXISTS `guid` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 		`guid` CHAR( 16 ) NOT NULL , INDEX ( `guid` ) ) ENGINE = MYISAM ");
 
+	q("ALTER TABLE `guid` CHANGE `guid` `guid` CHAR( 64 ) NOT NULL"); 
 }