diff --git a/db/migrate/20170704094757_add_render_timeouts_to_users.rb b/db/migrate/20170704094757_add_render_timeouts_to_users.rb
new file mode 100644
index 0000000000..7281de0b6b
--- /dev/null
+++ b/db/migrate/20170704094757_add_render_timeouts_to_users.rb
@@ -0,0 +1,15 @@
+require 'carto/db/migration_helper'
+
+include Carto::Db::MigrationHelper
+
+migration(
+  Proc.new do
+    # The 0 value means: "apply default render timeouts" (defined by the tiler)
+    add_column :users, :user_render_timeout, :integer, default: 0, null: false
+    add_column :users, :database_render_timeout, :integer, default: 0, null: false
+  end,
+  Proc.new do
+    drop_column :users, :user_render_timeout
+    drop_column :users, :database_render_timeout
+  end
+)