diff --git a/anki/facts.py b/anki/facts.py
index 50ef835a2..8f7a93abf 100644
--- a/anki/facts.py
+++ b/anki/facts.py
@@ -5,7 +5,7 @@
 import time
 from anki.errors import AnkiError
 from anki.utils import fieldChecksum, intTime, \
-    joinFields, splitFields, ids2str, stripHTML, timestampID
+    joinFields, splitFields, ids2str, stripHTML, timestampID, guid64
 
 class Fact(object):
 
@@ -17,23 +17,28 @@ class Fact(object):
             self.load()
         else:
             self.id = timestampID(deck.db, "facts")
+            self.guid = guid64()
             self._model = model
             self.gid = model['gid']
             self.mid = model['id']
             self.tags = []
             self.fields = [""] * len(self._model['flds'])
+            self.flags = 0
             self.data = ""
             self._fmap = self.deck.models.fieldMap(self._model)
 
     def load(self):
-        (self.mid,
+        (self.guid,
+         self.mid,
          self.gid,
          self.mod,
          self.usn,
          self.tags,
          self.fields,
+         self.flags,
          self.data) = self.deck.db.first("""
-select mid, gid, mod, usn, tags, flds, data from facts where id = ?""", self.id)
+select guid, mid, gid, mod, usn, tags, flds, flags, data
+from facts where id = ?""", self.id)
         self.fields = splitFields(self.fields)
         self.tags = self.deck.tags.split(self.tags)
         self._model = self.deck.models.get(self.mid)
@@ -45,10 +50,10 @@ select mid, gid, mod, usn, tags, flds, data from facts where id = ?""", self.id)
         sfld = stripHTML(self.fields[self.deck.models.sortIdx(self._model)])
         tags = self.stringTags()
         res = self.deck.db.execute("""
-insert or replace into facts values (?, ?, ?, ?, ?, ?, ?, ?, ?)""",
-                            self.id, self.mid, self.gid,
+insert or replace into facts values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+                            self.id, self.guid, self.mid, self.gid,
                             self.mod, self.usn, tags,
-                            self.joinedFields(), sfld, self.data)
+                            self.joinedFields(), sfld, self.flags, self.data)
         self.id = res.lastrowid
         self.updateFieldChecksums()
         self.deck.tags.register(self.tags)
diff --git a/anki/storage.py b/anki/storage.py
index 71d65b734..8be69e621 100644
--- a/anki/storage.py
+++ b/anki/storage.py
@@ -74,6 +74,7 @@ create table if not exists deck (
 
 create table if not exists facts (
     id              integer primary key,
+    guid            integer not null,
     mid             integer not null,
     gid             integer not null,
     mod             integer not null,
@@ -81,6 +82,7 @@ create table if not exists facts (
     tags            text not null,
     flds            text not null,
     sfld            integer not null,
+    flags           integer not null,
     data            text not null
 );
 
@@ -205,7 +207,7 @@ end)
 """)
     # pull facts into memory, so we can merge them with fields efficiently
     facts = db.all("""
-select id, modelId, 1, cast(created*1000 as int), cast(modified as int), 0, tags
+select id, id, modelId, 1, cast(created*1000 as int), cast(modified as int), 0, tags
 from facts order by created""")
     # build field hash
     fields = {}
@@ -225,19 +227,19 @@ from facts order by created""")
         oldid = row[0]
         row = list(row)
         # get rid of old created column and update id
-        while row[3] in times:
-            row[3] += 1
-        times[row[3]] = True
-        factidmap[row[0]] = row[3]
-        row[0] = row[3]
-        del row[3]
+        while row[4] in times:
+            row[4] += 1
+        times[row[4]] = True
+        factidmap[row[0]] = row[4]
+        row[0] = row[4]
+        del row[4]
         map[oldid] = row[0]
         row.append(minimizeHTML("\x1f".join([x[1] for x in sorted(fields[oldid])])))
         data.append(row)
     # and put the facts into the new table
     db.execute("drop table facts")
     _addSchema(db, False)
-    db.executemany("insert into facts values (?,?,?,?,?,?,?,'','')", data)
+    db.executemany("insert into facts values (?,?,?,?,?,?,?,?,'',0,'')", data)
     db.execute("drop table fields")
 
     # cards
diff --git a/anki/utils.py b/anki/utils.py
index c99d89597..a2c99bc2c 100644
--- a/anki/utils.py
+++ b/anki/utils.py
@@ -182,6 +182,9 @@ def timestampID(db, table):
         t += 1
     return t
 
+def guid64():
+    return random.randint(-sys.maxint-1, sys.maxint)
+
 # Fields
 ##############################################################################