diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index 3492960bad..c125d5f9b8 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -94,6 +94,7 @@ CREATE TABLE phpbb_config (
    cookie_secure tinyint(1), 
    session_length int(11), 
    allow_html tinyint(1),
+   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL, 
    allow_bbcode tinyint(1),
    allow_smilies tinyint(1),
    allow_sig tinyint(1),
@@ -116,6 +117,7 @@ CREATE TABLE phpbb_config (
    avatar_max_width smallint(6) DEFAULT '70' NOT NULL, 
    avatar_max_height smallint(6) DEFAULT '70' NOT NULL, 
    avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
+   smilies_path char(100) DEFAULT 'images/smiles' NOT NULL, 
    default_theme int(11) DEFAULT '1' NOT NULL,
    default_lang varchar(255),
    default_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
@@ -201,10 +203,12 @@ CREATE TABLE phpbb_posts (
    post_time int(10) DEFAULT '0' NOT NULL,
    poster_ip char(8) NOT NULL, 
    post_username varchar(30), 
+   enable_bbcode smallint(1) DEFAULT '1' NOT NULL,
+   enable_html smallint(1) DEFAULT '0' NOT NULL,
+   enable_smilies smallint(1) DEFAULT '1' NOT NULL,
    bbcode_uid char(10) NOT NULL,
    post_edit_time int(11),
    post_edit_count smallint(4) DEFAULT '0' NOT NULL,
-	enable_smiles smallint(4) DEFAULT '1' NOT NULL,
    PRIMARY KEY (post_id),
    KEY forum_id (forum_id),
    KEY topic_id (topic_id),
diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index 68a33d387e..248acd6e7d 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -95,6 +95,7 @@ CREATE TABLE phpbb_config (
    cookie_secure int2, 
    session_length int4, 
    allow_html int2 NOT NULL,
+   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL, 
    allow_bbcode int2 NOT NULL,
    allow_smilies int2 NOT NULL,
    allow_sig int2 NOT NULL,
@@ -120,6 +121,7 @@ CREATE TABLE phpbb_config (
    avatar_max_width int2 DEFAULT '70' NOT NULL,
    avatar_max_height int2 DEFAULT '70' NOT NULL,
    avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
+   smilies_patch varchar(50) DEFAULT 'images/smiles' NOT NULL, 
    override_themes int2 NOT NULL,
    flood_interval int NOT NULL,
    prune_enable int2 DEFAULT '1' NOT NULL, 
@@ -207,10 +209,12 @@ CREATE TABLE phpbb_posts (
    post_time int4 DEFAULT '0' NOT NULL, 
    post_username varchar(30), 
    poster_ip char(8) DEFAULT '' NOT NULL,
+   enable_bbcode int2 DEFAULT '1' NOT NULL,
+   enable_html int2 DEFAULT '0' NOT NULL,
+   enable_smilies int2 DEFAULT '1' NOT NULL,
    bbcode_uid varchar(10) DEFAULT '' NOT NULL, 
    post_edit_time int4,
    post_edit_count int2 DEFAULT '0' NOT NULL, 
-	enable_smiles int2 DEFAULT '1' NOT NULL,
    CONSTRAINT phpbb_posts_pkey PRIMARY KEY (post_id)
 );
 CREATE  INDEX forum_id_phpbb_posts_index ON phpbb_posts (forum_id);