diff --git a/boot.php b/boot.php
index cdb1b35edb..f03a5be20f 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1017   );
+define ( 'BUILD_ID',               1018   );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/database.sql b/database.sql
index ffea60c49f..a0b121b0a6 100644
--- a/database.sql
+++ b/database.sql
@@ -381,4 +381,30 @@ CREATE TABLE IF NOT EXISTS `register` (
   `uid` INT(11) UNSIGNED NOT NULL,
   `password` CHAR(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE = MYISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `clients` (
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`pw` VARCHAR( 20 ) NOT NULL ,
+`redirect_uri` VARCHAR( 200 ) NOT NULL ,
+PRIMARY KEY ( `client_id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `tokens` (
+`id` VARCHAR( 40 ) NOT NULL ,
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`expires` INT NOT NULL ,
+`scope` VARCHAR( 200 ) NOT NULL ,
+PRIMARY KEY ( `id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `auth_codes` (
+`id` VARCHAR( 40 ) NOT NULL ,
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`redirect_uri` VARCHAR( 200 ) NOT NULL ,
+`expires` INT NOT NULL ,
+`scope` VARCHAR( 250 ) NOT NULL ,
+PRIMARY KEY ( `id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
diff --git a/update.php b/update.php
index 7ee27213d8..c4995604e7 100644
--- a/update.php
+++ b/update.php
@@ -139,3 +139,31 @@ function update_1016() {
 	q("ALTER TABLE `user` ADD `openid` CHAR( 255 ) NOT NULL AFTER `email` ");
 }
 
+function update_1017() {
+
+	q(" CREATE TABLE IF NOT EXISTS `clients` (
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`pw` VARCHAR( 20 ) NOT NULL ,
+`redirect_uri` VARCHAR( 200 ) NOT NULL ,
+PRIMARY KEY ( `client_id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+
+	q(" CREATE TABLE IF NOT EXISTS `tokens` (
+`id` VARCHAR( 40 ) NOT NULL ,
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`expires` INT NOT NULL ,
+`scope` VARCHAR( 200 ) NOT NULL ,
+PRIMARY KEY ( `id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+
+	q("CREATE TABLE IF NOT EXISTS `auth_codes` (
+`id` VARCHAR( 40 ) NOT NULL ,
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`redirect_uri` VARCHAR( 200 ) NOT NULL ,
+`expires` INT NOT NULL ,
+`scope` VARCHAR( 250 ) NOT NULL ,
+PRIMARY KEY ( `id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+
+}
+