diff --git a/install/sql/incremental/upd_0071.sql b/install/sql/incremental/upd_0071.sql
new file mode 100644
index 0000000000000000000000000000000000000000..b4bafd851e9b57e3d772b08f3ab85736856256d2
--- /dev/null
+++ b/install/sql/incremental/upd_0071.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `client`
+	ADD `limit_database_quota` int(11) NOT NULL default '-1' AFTER	`limit_database`;
+ALTER TABLE `client_template`
+	ADD `limit_database_quota` int(11) NOT NULL default '-1' AFTER	`limit_database`;
+ALTER TABLE `web_database`
+	ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`,
+	ADD `last_quota_notification` date NULL default NULL;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 116ec145e90ae3e25348b001715cf13944fb38a7..27eb1e55d44254df80cdfaadcfa9442f3b06c56c 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -214,6 +214,7 @@ CREATE TABLE `client` (
   `default_dbserver` int(11) NOT NULL DEFAULT '1',
   `dns_servers` blob NOT NULL DEFAULT '',
   `limit_database` int(11) NOT NULL DEFAULT '-1',
+  `limit_database_quota` int(11) NOT NULL default '-1',
   `limit_cron` int(11) NOT NULL DEFAULT '0',
   `limit_cron_type` enum('url','chrooted','full') NOT NULL DEFAULT 'url',
   `limit_cron_frequency` int(11) NOT NULL DEFAULT '5',
@@ -317,6 +318,7 @@ CREATE TABLE `client_template` (
   `limit_dns_slave_zone` int(11) NOT NULL default '-1',
   `limit_dns_record` int(11) NOT NULL default '-1',
   `limit_database` int(11) NOT NULL default '-1',
+  `limit_database_quota` int(11) NOT NULL default '-1',
   `limit_cron` int(11) NOT NULL default '0',
   `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',
   `limit_cron_frequency` int(11) NOT NULL default '5',
@@ -1758,6 +1760,7 @@ CREATE TABLE `web_database` (
   `type` varchar(16) NOT NULL DEFAULT 'y',
   `database_name` varchar(64) DEFAULT NULL,
   `database_name_prefix` varchar(50) NOT NULL default '',
+  `database_quota` int(11) unsigned DEFAULT NULL,
   `database_user_id` int(11) unsigned DEFAULT NULL,
   `database_ro_user_id` int(11) unsigned DEFAULT NULL,
   `database_charset` varchar(64) DEFAULT NULL,