diff --git a/boot.php b/boot.php
index 2ef5853e00..480001475b 100644
--- a/boot.php
+++ b/boot.php
@@ -218,6 +218,20 @@ define ( 'CP_USERS_ON_SERVER',     0 );
 define ( 'CP_GLOBAL_COMMUNITY',    1 );
 /** @}*/
 
+/**
+ * @name Protocols
+ *
+ * Different protocols that we are storing
+ * @{
+ */
+define('PROTOCOL_UNKNOWN',         0);
+define('PROTOCOL_DFRN',            1);
+define('PROTOCOL_DIASPORA',        2);
+define('PROTOCOL_OSTATUS_SALMON',  3);
+define('PROTOCOL_OSTATUS_FEED',    4);
+define('PROTOCOL_GS_CONVERSATION', 5);
+/** @}*/
+
 /**
  * @name Network
  *
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 0d5c10f98d..9842b9754d 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -788,6 +788,19 @@ function db_definition() {
 					"uid" => array("uid"),
 					)
 			);
+	$database["conversation"] = array(
+			"fields" => array(
+					"item-uri" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
+					"reply-to-uri" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
+					"conversation-uri" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
+					"protocol" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
+					"source" => array("type" => "mediumtext"),
+					),
+			"indexes" => array(
+					"PRIMARY" => array("item-uri"),
+					"conversation-uri" => array("conversation-uri"),
+					)
+			);
 	$database["event"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),