diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 17d31bd0454..b039a13166e 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -9114,6 +9114,7 @@ public class ManagementServerImpl implements ManagementServer {
     @Override
     public boolean updateCertificate(String certificatePath)
     {
+    	
     	return false;
     }
 
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index e98fd6768f8..7e3587ed740 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -82,6 +82,7 @@ DROP TABLE IF EXISTS `cloud`.`hypervisor_properties`;
 DROP TABLE IF EXISTS `cloud`.`account_network_ref`;
 DROP TABLE IF EXISTS `cloud`.`instance_group`;
 DROP TABLE IF EXISTS `cloud`.`instance_group_vm_map`;
+DROP TABLE IF EXISTS `cloud`.`certificate`;
 
 CREATE TABLE `cloud`.`hypervsior_properties` (
   `hypervisor` varchar(32) NOT NULL UNIQUE COMMENT 'hypervisor type',
@@ -113,6 +114,12 @@ CREATE TABLE `cloud`.`account_network_ref` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `cloud`.`certificate` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `certificate` text COMMENT 'the actual custom certificate being stored in the db',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 CREATE TABLE `cloud`.`nics` (
   `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
   `instance_id` bigint unsigned NOT NULL COMMENT 'vm instance id',
diff --git a/setup/db/schema-21to22.sql b/setup/db/schema-21to22.sql
index 9fbd99612fa..90ebe3ec441 100644
--- a/setup/db/schema-21to22.sql
+++ b/setup/db/schema-21to22.sql
@@ -19,6 +19,11 @@ CREATE TABLE `cloud`.`instance_group_vm_map` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `cloud`.`certificate` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `certificate` text COMMENT 'the actual custom certificate being stored in the db',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 ALTER TABLE `cloud`.`data_center` MODIFY COLUMN `guest_network_cidr` varchar(18); -- modify column width to 18 from 15