diff --git a/ccm-forum/application.xml b/ccm-forum/application.xml
index 778729927..af6405da1 100755
--- a/ccm-forum/application.xml
+++ b/ccm-forum/application.xml
@@ -6,14 +6,17 @@
release="1">
-
-
+
+
+ A threadded forum application for online discussions using the Red Hat
+ Web Application Framework.
+
The Red Hat Web Application Framework is a platform for writing
database-backed web applications in Java.
diff --git a/ccm-forum/etc/enterprise.init.in b/ccm-forum/etc/enterprise.init.in
deleted file mode 100755
index e69de29bb..000000000
diff --git a/ccm-forum/pdl/com/arsdigita/forum/Forum.pdl b/ccm-forum/pdl/com/arsdigita/forum/Forum.pdl
index 9181a49cd..617d6ceba 100755
--- a/ccm-forum/pdl/com/arsdigita/forum/Forum.pdl
+++ b/ccm-forum/pdl/com/arsdigita/forum/Forum.pdl
@@ -15,7 +15,7 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Forum.pdl 542 2005-06-03 15:17:05Z sskracic $
+// $Id: Forum.pdl 1628 2007-09-17 08:10:40Z chrisg23 $
// $DateTime: 2004/08/17 23:26:27 $
model com.arsdigita.forum;
diff --git a/ccm-forum/pdl/com/arsdigita/forum/Post.pdl b/ccm-forum/pdl/com/arsdigita/forum/Post.pdl
index f18fbde31..4303cc317 100755
--- a/ccm-forum/pdl/com/arsdigita/forum/Post.pdl
+++ b/ccm-forum/pdl/com/arsdigita/forum/Post.pdl
@@ -15,7 +15,7 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Post.pdl 287 2005-02-22 00:29:02Z sskracic $
+// $Id: Post.pdl 1628 2007-09-17 08:10:40Z chrisg23 $
// $DateTime: 2004/08/17 23:26:27 $
model com.arsdigita.forum;
diff --git a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql
index 054678d46..66219cdb2 100755
--- a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql
@@ -1 +1 @@
-@@ ../oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql
+@@ oracle-se/1.4.2-1.4.3/add-is_noticeboard.sql
diff --git a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.3-1.4.4.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.3-1.4.4.sql
index d5db3b93f..8baeca182 100755
--- a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.3-1.4.4.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.3-1.4.4.sql
@@ -1 +1 @@
-@@ ../oracle-se/upgrade/1.4.3-1.4.4/add-expiry.sql
+@@ oracle-se/1.4.3-1.4.4/add-expiry.sql
diff --git a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql
index 4155005c2..b63f24632 100644
--- a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql
@@ -1,8 +1,30 @@
-@@ ../default/upgrade/6.5.0-6.5.1/add_privileges.sql
-@@ ../default/upgrade/6.5.0-6.5.1/add_groups.sql
-@@ ../default/upgrade/6.5.0-6.5.1/add_thread_subscriber.sql
-@@ ../default/upgrade/6.5.0-6.5.1/add_file_attachments.sql
-@@ ../default/upgrade/6.5.0-6.5.1/add_forum_introduction.sql
-@@ ../default/upgrade/6.5.0-6.5.1/add_image_uploads.sql
-@@ ../default/upgrade/6.5.0-6.5.1/add_forum_no_category_posts.sql
-@@ ../default/upgrade/6.5.0-6.5.1/add_anonymous_option.sql
+--
+-- Copyright (C) chris.gilbert@westsussex.gov.uk All Rights Reserved.
+-- Copyright (C) pb@zes.uni-bremen.de All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+
+PROMPT APLAWS ccm-forum 6.5.0 -> 6.5.1 Upgrade Script (Oracle)
+
+
+@@ ./oracle-se/6.5.0-6.5.1/add_privileges.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_groups.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_file_attachments.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_forum_introduction.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_image_uploads.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_anonymous_option.sql
diff --git a/ccm-forum/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/1.4.2-1.4.3/add-is_noticeboard.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/1.4.2-1.4.3/add-is_noticeboard.sql
diff --git a/ccm-forum/sql/ccm-forum/oracle-se/upgrade/1.4.3-1.4.4/add-expiry.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/1.4.3-1.4.4/add-expiry.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/oracle-se/upgrade/1.4.3-1.4.4/add-expiry.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/1.4.3-1.4.4/add-expiry.sql
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_anonymous_option.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_anonymous_option.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_anonymous_option.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_anonymous_option.sql
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_file_attachments.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_file_attachments.sql
similarity index 82%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_file_attachments.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_file_attachments.sql
index 0437bca96..e5dcb666b 100644
--- a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_file_attachments.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_file_attachments.sql
@@ -1,7 +1,7 @@
create table forum_post_files
- (post_id NUMBER,
- file_id NUMBER not null,
- file_order NUMBER);
+ (post_id NUMBER,
+ file_id NUMBER not null,
+ file_order NUMBER);
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_forum_introduction.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_forum_introduction.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_forum_introduction.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_forum_introduction.sql
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_forum_no_category_posts.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_forum_no_category_posts.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_groups.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_groups.sql
similarity index 81%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_groups.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_groups.sql
index f05d54834..4d732b63b 100644
--- a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_groups.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_groups.sql
@@ -1,8 +1,8 @@
alter table forum_forums
-add (admin_group_id NUMBER,
- create_group_id NUMBER,
- respond_group_id NUMBER,
- read_group_id NUMBER);
+add (admin_group_id NUMBER,
+ create_group_id NUMBER,
+ respond_group_id NUMBER,
+ read_group_id NUMBER);
alter table forum_forums add
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_image_uploads.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_image_uploads.sql
similarity index 80%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_image_uploads.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_image_uploads.sql
index da6af6394..20792bd10 100644
--- a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_image_uploads.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_image_uploads.sql
@@ -1,7 +1,7 @@
create table forum_post_images
- (post_id NUMBER,
- image_id NUMBER not null,
- image_order NUMBER);
+ (post_id NUMBER,
+ image_id NUMBER not null,
+ image_order NUMBER);
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_privileges.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_privileges.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_privileges.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_privileges.sql
diff --git a/ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_thread_subscriber.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/default/upgrade/6.5.0-6.5.1/add_thread_subscriber.sql
rename to ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql
index 08aba8777..c306167fe 100755
--- a/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql
@@ -1 +1 @@
-\i ../postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql
+\i postgres/1.4.2-1.4.3/add-is_noticeboard.sql
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.3-1.4.4.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.3-1.4.4.sql
index b50f03a43..d4b1eed49 100755
--- a/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.3-1.4.4.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.3-1.4.4.sql
@@ -1 +1 @@
-\i ../postgres/upgrade/1.4.3-1.4.4/add-expiry.sql
+\i postgres/1.4.3-1.4.4/add-expiry.sql
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres-6.5.0-6.5.1.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres-6.5.0-6.5.1.sql
index 1be788736..339ec28ce 100644
--- a/ccm-forum/sql/ccm-forum/upgrade/postgres-6.5.0-6.5.1.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres-6.5.0-6.5.1.sql
@@ -1,10 +1,36 @@
-\i ../default/upgrade/6.5.0-6.5.1/add_thread_subscriber.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_privileges.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_groups.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_privileges.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_file_attachments.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_forum_introduction.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_image_uploads.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_forum_no_category_posts.sql
-\i ../default/upgrade/6.5.0-6.5.1/add_anonymous_option.sql
+--
+-- Copyright (C) chris.gilbert@westsussex.gov.uk All Rights Reserved.
+-- Copyright (C) pb@zes.uni-bremen.de All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+
+\echo APLAWS ccm-forum 6.5.0 -> 6.5.1 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i ./postgres/6.5.0-6.5.1/add_privileges.sql
+\i ./postgres/6.5.0-6.5.1/add_groups.sql
+\i ./postgres/6.5.0-6.5.1/add_thread_subscriber.sql
+\i ./postgres/6.5.0-6.5.1/add_file_attachments.sql
+\i ./postgres/6.5.0-6.5.1/add_forum_introduction.sql
+\i ./postgres/6.5.0-6.5.1/add_image_uploads.sql
+\i ./postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql
+\i ./postgres/6.5.0-6.5.1/add_anonymous_option.sql
+
+commit;
+
+
diff --git a/ccm-forum/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/1.4.2-1.4.3/add-is_noticeboard.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql
rename to ccm-forum/sql/ccm-forum/upgrade/postgres/1.4.2-1.4.3/add-is_noticeboard.sql
diff --git a/ccm-forum/sql/ccm-forum/postgres/upgrade/1.4.3-1.4.4/add-expiry.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/1.4.3-1.4.4/add-expiry.sql
similarity index 100%
rename from ccm-forum/sql/ccm-forum/postgres/upgrade/1.4.3-1.4.4/add-expiry.sql
rename to ccm-forum/sql/ccm-forum/upgrade/postgres/1.4.3-1.4.4/add-expiry.sql
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql
new file mode 100644
index 000000000..1c668f922
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql
@@ -0,0 +1,3 @@
+alter table forum_forums add anonymous_posts_allowed BOOLEAN NOT NULL;
+
+update forum_forums set anonymous_posts_allowed = FALSE;
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql
new file mode 100644
index 000000000..0f1cacff1
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql
@@ -0,0 +1,24 @@
+create table forum_post_files
+ (file_id INTEGER not null,
+ file_order INTEGER,
+ post_id INTEGER);
+
+alter table forum_post_files add
+ constraint FORU_POS_FILES_FILE_ID_P_IO1IR primary key (file_id);
+
+alter table forum_post_files add
+ constraint FORU_POS_FILES_FILE_ID_F_XBKED foreign key (file_id)
+ references cms_files(file_id);
+
+alter table forum_post_files add
+ constraint FORU_POS_FILES_POST_ID_F_K0XJQ foreign key (post_id)
+ references forum_posts(post_id);
+
+
+
+alter table forum_forums add file_attachments_allowed BOOLEAN NOT NULL;
+
+update forum_forums set file_attachments_allowed = TRUE;
+
+
+
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_introduction.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_introduction.sql
new file mode 100644
index 000000000..c49090fb2
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_introduction.sql
@@ -0,0 +1,2 @@
+ALTER TABLE FORUM_FORUMS ADD
+ INTRODUCTION VARCHAR(4000) ;
\ No newline at end of file
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql
new file mode 100644
index 000000000..2cb31d9ac
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql
@@ -0,0 +1,3 @@
+alter table forum_forums add no_category_posts_allowed BOOLEAN NOT NULL;
+
+update forum_forums set no_category_posts_allowed = TRUE;
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_groups.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_groups.sql
new file mode 100644
index 000000000..ff68100fd
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_groups.sql
@@ -0,0 +1,24 @@
+alter table forum_forums add
+ admin_group_id INTEGER;
+alter table forum_forums add
+ constraint foru_foru_admi_grou_id_f_k0nw6 foreign key (admin_group_id)
+ references groups(group_id);
+
+alter table forum_forums add
+ create_group_id INTEGER;
+alter table forum_forums add
+ constraint foru_foru_crea_grou_id_f_f7x57 foreign key (create_group_id)
+ references groups(group_id);
+
+alter table forum_forums add
+ respond_group_id INTEGER;
+alter table forum_forums add
+ constraint foru_foru_respo_gro_id_f_rnofz foreign key (respond_group_id)
+ references groups(group_id);
+
+alter table forum_forums add
+ read_group_id INTEGER;
+alter table forum_forums add
+ constraint foru_forum_rea_grou_id_f_itati foreign key (read_group_id)
+ references groups(group_id);
+
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql
new file mode 100644
index 000000000..2643fa63f
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql
@@ -0,0 +1,23 @@
+create table forum_post_images
+ (post_id INTEGER,
+ image_id INTEGER not null,
+ image_order INTEGER);
+
+alter table forum_post_images add
+ constraint FORU_POS_IMAGE_IMAG_ID_P_EJ2MM PRIMARY key (image_id);
+
+alter table forum_post_images add
+ constraint FORU_POS_IMAGE_IMAG_ID_F_WYRXA foreign key (image_id)
+ references cms_images(image_id);
+
+alter table forum_post_images add
+ constraint FORU_POS_IMAGE_POST_ID_F_1HH02 foreign key (post_id)
+ references forum_posts(post_id);
+
+
+alter table forum_forums add image_uploads_allowed BOOLEAN NOT NULL;
+
+update forum_forums set image_uploads_allowed = FALSE;
+
+
+
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_privileges.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_privileges.sql
new file mode 100644
index 000000000..499b270c5
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_privileges.sql
@@ -0,0 +1,18 @@
+insert into acs_privileges (privilege)
+values ('forum_read');
+
+insert into acs_privileges (privilege)
+values ('forum_create_thread');
+
+insert into acs_privileges (privilege)
+values ('forum_respond');
+
+insert into acs_privilege_hierarchy (privilege, child_privilege)
+values ('forum_moderation', 'forum_create_thread');
+
+insert into acs_privilege_hierarchy (privilege, child_privilege)
+values ('forum_create_thread', 'forum_respond');
+
+insert into acs_privilege_hierarchy (privilege, child_privilege)
+values ('forum_respond', 'forum_read');
+
diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql
new file mode 100644
index 000000000..62a16c4d7
--- /dev/null
+++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql
@@ -0,0 +1,5 @@
+alter table forum_forums add subscribe_thread_starter BOOLEAN NOT NULL;
+
+update forum_forums set subscribe_thread_starter = FALSE;
+
+
diff --git a/ccm-forum/web/WEB-INF/bebop-define.tld b/ccm-forum/web/WEB-INF/bebop-define.tld
deleted file mode 100755
index e69de29bb..000000000
diff --git a/ccm-forum/web/WEB-INF/bebop-show.tld b/ccm-forum/web/WEB-INF/bebop-show.tld
deleted file mode 100755
index e69de29bb..000000000