diff --git a/client/gui_rpc_client.h b/client/gui_rpc_client.h
index 5e54727378..d1fb9be94f 100644
--- a/client/gui_rpc_client.h
+++ b/client/gui_rpc_client.h
@@ -1,3 +1,22 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+// 
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License. 
+// 
+// The Original Code is the Berkeley Open Infrastructure for Network Computing. 
+// 
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved. 
+// 
+// Contributor(s):
+//
+
 #include <stdio.h>
 #include <string>
 #include <vector>
diff --git a/client/main.h b/client/main.h
index 44197761c0..98fd9f50f0 100644
--- a/client/main.h
+++ b/client/main.h
@@ -1,3 +1,22 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+// 
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License. 
+// 
+// The Original Code is the Berkeley Open Infrastructure for Network Computing. 
+// 
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved. 
+// 
+// Contributor(s):
+//
+
 #ifdef _WIN32
 extern int boinc_main_loop(int argc, char** argv);
 extern void quit_client();
diff --git a/db/constraints.sql b/db/constraints.sql
index efeda5bf51..4bbb6a60f0 100644
--- a/db/constraints.sql
+++ b/db/constraints.sql
@@ -95,7 +95,7 @@ alter table host
 
 alter table profile
     add fulltext index profile_reponse(response1, response2),
-    add index pro_uotd (uotd_time desc);
+    add index pro_uotd (uotd_time desc),
     add unique profile_userid(userid);
 
 alter table subscriptions
diff --git a/doc/community.php b/doc/community.php
index 420e65f467..9cf3060fc5 100644
--- a/doc/community.php
+++ b/doc/community.php
@@ -54,6 +54,15 @@ cvs -d :pserver:anonymous@alien.ssl.berkeley.edu:/home/cvs/cvsroot checkout boin
 You can browse the BOINC
 <a href=http://setiathome.ssl.berkeley.edu/taskbase/database.cgi>bug-tracking database</a>.
 
+<h2>News feeds</h2>
+<p>
+RSS-based news feeds are available from BOINC
+and from several BOINC-based projects:
+<ul>
+<li> BOINC: http://boinc.berkeley.edu/rss_main.php
+<li> BOINC alpha test: http://setiboinc.berkeley.edu/boinc_alpha/rss_main.php
+<li> BOINC beta test: http://setiboinc.berkeley.edu/ap/rss_main.php
+</ul>
 <h2>Other</h2>
 For other information, contact Dr. David P. Anderson,
 the director of the BOINC project, at davea at ssl.berkeley.edu.
diff --git a/doc/index.php b/doc/index.php
index d42d8abf70..ca9c8298fa 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -83,6 +83,8 @@ if (count($project_news) > 6) {
 }
 
 echo "
+<p><font size=-2>News is available as an
+<a href=rss_main.php>RSS feed</a></font>
 </table>
 ";
 ?>
diff --git a/doc/rss_main.php b/doc/rss_main.php
index 84b96090a9..3ead48562a 100644
--- a/doc/rss_main.php
+++ b/doc/rss_main.php
@@ -25,36 +25,42 @@ if (!$news) {
 
 // inclue project constants and news file
 //
-require_once("../project/project.inc");
-require_once("../project/project_news.inc");
+require_once("boinc_news.inc");
 
 // Create channel header and open XML content
 //
 $description = "BOINC project ".PROJECT.": Main page News";
-$channel_image = MASTER_URL . "rss_image.jpg";
+$channel_image = "http://boinc.berkeley.edu/boinc.gif";
 $create_date  = gmdate('D, d M Y H:i:s') . ' GMT'; 
 $language = "en-us";
-echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n"
-    ."<rss version=\"2.0\">\n<channel>\n    <title>"
-    .PROJECT."</title>\n    <link>"
-    .MASTER_URL."</link>\n    <description>"
-    .$description."</description>\n    <copyright>"
-    .COPYRIGHT_HOLDER."</copyright>\n    <lastBuildDate>"
-    .$create_date."</lastBuildDate>\n    <language>"
-    .$language."</language>\n    <image>\n      <url>"
-    .$channel_image."</url>\n      <title>"
-    .PROJECT."</title>\n      <link>"
-    .MASTER_URL."</link>\n    </image>\n";
+echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>
+    <rss version=\"2.0\">
+    <channel>
+        <title>BOINC</title>
+        <link>http://boinc.berkeley.edu</link>
+        <description>Berkeley Open Infrastructure for Network Computing</description>
+        <copyright>U.C. Berkeley</copyright>
+        <lastBuildDate>$create_date</lastBuildDate>
+        <language>$language</language>
+        <image>
+            <url>$channel_image</url>
+            <title>BOINC</title>
+            <link>http://boinc.berkeley.edu</link>
+        </image>
+";
 
 // - Create news items
 //
 $news = min( count($project_news), $news);
 for( $item=0; $item < $news; $item++ ) {
-if( count($project_news[$item]) == 2) {
-    echo "    <item>\n     <title>Project News "
-         .strip_tags($project_news[$item][0])."</title>\n     <link>"
-         .MASTER_URL."</link>\n     <description>"
-         .strip_tags($project_news[$item][1])."</description>\n    </item>";
+    if( count($project_news[$item]) == 2) {
+        echo "    <item>\n     <title>Project News "
+         .strip_tags($project_news[$item][0])."</title>
+         <link>http://boinc.berkeley.edu</link>
+         <description>"
+         .strip_tags($project_news[$item][1])."</description>
+         </item>
+        ";
     }
 }