diff --git a/classes/Profile_tag.php b/classes/Profile_tag.php
new file mode 100644
index 0000000000..f2d6ec6cf8
--- /dev/null
+++ b/classes/Profile_tag.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Table Definition for profile_tag
+ */
+require_once 'classes/Memcached_DataObject';
+
+class Profile_tag extends Memcached_DataObject 
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'profile_tag';                     // table name
+    public $tagger;                          // int(4)  primary_key not_null
+    public $tagged;                          // int(4)  primary_key not_null
+    public $tag;                             // varchar(64)  primary_key not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_tag',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/classes/laconica.ini b/classes/laconica.ini
index 466707735c..470c0eaf1b 100644
--- a/classes/laconica.ini
+++ b/classes/laconica.ini
@@ -157,6 +157,7 @@ user_id = 129
 notice_id = 129
 source = 17
 created = 142
+source = 17
 
 [notice_inbox__keys]
 user_id = K
@@ -195,6 +196,17 @@ modified = 384
 [profile__keys]
 id = N
 
+[profile_tag]
+tagger = 129
+tagged = 129
+tag = 130
+modified = 384
+
+[profile_tag__keys]
+tagger = K
+tagged = K
+tag = K
+
 [queue_item]
 notice_id = 129
 transport = 130
@@ -296,10 +308,10 @@ smsreplies = 17
 smsemail = 2
 uri = 2
 autosubscribe = 17
+urlshorteningservice = 2
+inboxed = 17
 created = 142
 modified = 384
-inboxed = 17
-urlshorteningservice = 2
 
 [user__keys]
 id = K
diff --git a/db/laconica.sql b/db/laconica.sql
index 4f4c37bd6a..3417ef254d 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -345,3 +345,15 @@ create table notice_inbox (
     constraint primary key (user_id, notice_id),
     index notice_inbox_notice_id_idx (notice_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table profile_tag (
+   tagger integer not null comment 'user making the tag' references user (id),
+   tagged integer not null comment 'profile tagged' references profile (id),
+   tag varchar(64) not null comment 'hash tag associated with this notice',
+   modified timestamp comment 'date the tag was added',
+   
+   constraint primary key (tagger, tagged, tag),
+   index profile_tag_modified_idx (modified),
+   index profile_tag_tagger_tag_idx (tagger, tag)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+