diff --git a/CHANGELOG b/CHANGELOG
index eb50a48bbf..b639ccaf1c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Support timestamp field
 * Validate dictionary items
 * Add (i)like support to domain inversion
 * Improve loading strategy by using views
diff --git a/src/model.js b/src/model.js
index a917a934aa..a4b177b85a 100644
--- a/src/model.js
+++ b/src/model.js
@@ -1346,6 +1346,7 @@
             case 'selection':
                 return Sao.field.Selection;
             case 'datetime':
+            case 'timestamp':
                 return Sao.field.DateTime;
             case 'date':
                 return Sao.field.Date;
diff --git a/src/view/form.js b/src/view/form.js
index f6b493a0fd..9aaf484385 100644
--- a/src/view/form.js
+++ b/src/view/form.js
@@ -947,6 +947,7 @@ function eval_pyson(value){
             case 'date':
                 return Sao.View.Form.Date;
             case 'datetime':
+            case 'timestamp':
                 return Sao.View.Form.DateTime;
             case 'time':
                 return Sao.View.Form.Time;