diff --git a/packages/strapi-hook-bookshelf/lib/index.js b/packages/strapi-hook-bookshelf/lib/index.js
index abfaa347bb..9d1bc9a12a 100644
--- a/packages/strapi-hook-bookshelf/lib/index.js
+++ b/packages/strapi-hook-bookshelf/lib/index.js
@@ -421,7 +421,7 @@ module.exports = function(strapi) {
                             break;
                           case 'integer':
                           case 'biginteger':
-                            type = definition.client === 'pg' ? 'integer' : 'int';
+                            type = definition.client === 'pg' ? 'bigint' : 'bigint';
                             break;
                           case 'float':
                             type = definition.client === 'pg' ? 'double precision' : 'double';
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js
index ac8030a6fd..e7849d8748 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js
@@ -42,6 +42,7 @@ class AttributeRow extends React.Component {
       string: IcoString,
       text: IcoText,
       integer: IcoNumber,
+      biginteger: IcoNumber,
       float: IcoNumber,
       decimal: IcoNumber,
       email: IcoEmail,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
index 38d1808991..5e649539d6 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
@@ -259,6 +259,7 @@
             "value": "integer",
             "items": [
               { "name": "content-type-builder.form.attribute.item.number.type.integer", "value": "integer" },
+              { "name": "content-type-builder.form.attribute.item.number.type.biginteger", "value": "big integer" },
               { "name": "content-type-builder.form.attribute.item.number.type.float", "value": "float" },
               { "name": "content-type-builder.form.attribute.item.number.type.decimal", "value": "decimal" }
             ],
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
index e2486a91d6..bb2a47972e 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
@@ -41,7 +41,7 @@ import styles from './styles.scss';
 
 // Array of attributes that the ctb can handle at the moment
 const availableAttributes = Object.keys(forms.attribute);
-availableAttributes.push('integer', 'decimal', 'float');
+availableAttributes.push('integer', 'biginteger', 'decimal', 'float');
 
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 /* eslint-disable react/jsx-wrap-multilines */
@@ -164,6 +164,7 @@ export class ModelPage extends React.Component { // eslint-disable-line react/pr
 
     switch (attribute.params.type) {
       case 'integer':
+      case 'biginteger':
       case 'float':
       case 'decimal':
         attributeType = 'number';
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
index 9f18df4e65..0bf245cd97 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
@@ -7,6 +7,7 @@
   "attribute.enumeration": "Enumeration",
   "attribute.float": "Float",
   "attribute.integer": "integer",
+  "attribute.biginteger": "big integer",
   "attribute.json": "JSON",
   "attribute.media": "Media",
   "attribute.password": "Password",
diff --git a/packages/strapi-plugin-content-type-builder/utils/Manager.js b/packages/strapi-plugin-content-type-builder/utils/Manager.js
index 662d0e1d85..9f58894694 100644
--- a/packages/strapi-plugin-content-type-builder/utils/Manager.js
+++ b/packages/strapi-plugin-content-type-builder/utils/Manager.js
@@ -92,6 +92,7 @@ class Manager {
       case 'decimal':
       case 'float':
       case 'integer':
+      case 'biginteger':
       case 'number':
         return 4;
       case 'json':