diff --git a/checkin_notes b/checkin_notes
index b828acfaf7..a215b724d7 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -5847,3 +5847,19 @@ David  12 June 2006
         graphics_api.h
         static_graphics.C
         x_opengl.C
+
+David  12 June 2006
+    - User web: expand the list of message-board rules a bit
+        (no ads, no trolling etc.)
+        Link to a page that describes the moderation policy in more detail.
+    - Add a page (not linked to anywhere) containing instructions for moderators.
+
+    NOTE: the latter 2 pages are included as samples;
+    you'll want to rename sample_X to X unless you need to customize it.
+
+    html/
+        inc/
+            forum.inc
+        user/
+            sample_moderation.inc (new)
+            sample_moderator_instructions.inc (new)
diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index 88ffdd1f35..7205fdf920 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -537,10 +537,22 @@ function show_forum_summary($forum) {
 }
 
 function post_warning() {
-    return "<br><br><font size=-2>
-        Don't use obscene language or images,
-        and don't threaten other participants;
-        otherwise we may delete your messages.</font>
+    return "<br><br>
+        <table><tr><td>
+        <font size=-2>
+        Rules:
+        <ul>
+        <li> No commercial advertisements.
+        <li> No messages whose only intention is to annoy or antagonize other people.
+        <li> No messages whose only intention is to hijack a thread.
+        <li> No messages that are deliberately hostile or insulting.
+        <li> No abusive comments involving race, religion,
+        nationality, gender, class or sexuality.
+        <li> No obscene language.
+        </ul>
+        <a href=moderation.php>More info</a>
+        </font>
+        </td></tr></table>
     ";
 }
 
diff --git a/html/user/sample_moderation.php b/html/user/sample_moderation.php
new file mode 100644
index 0000000000..4e871272c9
--- /dev/null
+++ b/html/user/sample_moderation.php
@@ -0,0 +1,26 @@
+<?php
+require_once("../inc/util.inc");
+require_once("../project/project.inc");
+
+page_head("Moderation");
+echo "
+To maximize discussion and flow of information,
+our message boards are moderated.
+Message board postings are subject to several <b>posting rules</b>,
+listed in the post-message page.
+Moderators may delete posts that violate any of these rules.
+The authors of deleted posts will be notified via email.
+
+<p>
+If you think a post violates any of the posting rules,
+click the red X on the post and fill out the form;
+moderators will be notified of your complaint.
+
+<p>
+The moderation policy is set by the ".PROJECT." project.
+If you have comments about the policy, email ".SYS_ADMIN_EMAIL.".
+
+";
+page_tail();
+
+?>
diff --git a/html/user/sample_moderator_instructions.php b/html/user/sample_moderator_instructions.php
new file mode 100644
index 0000000000..5dd3b554fc
--- /dev/null
+++ b/html/user/sample_moderator_instructions.php
@@ -0,0 +1,19 @@
+<?php
+require_once("../inc/util.inc");
+require_once("../project/project.inc");
+
+page_head("Moderator instructions");
+echo "
+<ul>
+<li> Don't let your personal feelings
+affect your moderation decisions.
+<li> Don't discuss moderation decisions on the forums
+of this or other BOINC projects.
+Use the email list that has been set up for this purpose.
+<li> Don't preemptively moderate.
+Except for obscene language or pictures,
+avoid deleting a post until someone complains about it.
+";
+page_tail();
+
+?>