diff --git a/VERSION b/VERSION
index 9685a970..ef2c7eb5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.14.16.51.54
+Version 2.6.0-development+timestamp.2013.07.15.09.21.09
diff --git a/gluon/dal.py b/gluon/dal.py
index af204946..14e2de47 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -8307,8 +8307,9 @@ class Table(object):
         field_type = self if same_db else 'bigint'
         clones = []
         for field in self:
+            nfk = same_db or field.type.startswith('reference')
             clones.append(field.clone(
-                    unique=False, type=field.type if same_db else 'bigint'))
+                    unique=False, type=field.type if nfk else 'bigint'))
         archive_db.define_table(
             archive_name, Field(current_record,field_type), *clones)
         self._before_update.append(