diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
new file mode 100644
index 0000000000..8069ea6e77
--- /dev/null
+++ b/wp-admin/options-discussion.php
@@ -0,0 +1,119 @@
+<?php
+$title = 'Discussion Options';
+
+function add_magic_quotes($array) {
+	foreach ($array as $k => $v) {
+		if (is_array($v)) {
+			$array[$k] = add_magic_quotes($v);
+		} else {
+			$array[$k] = addslashes($v);
+		}
+	}
+	return $array;
+}
+
+if (!get_magic_quotes_gpc()) {
+	$HTTP_GET_VARS    = add_magic_quotes($HTTP_GET_VARS);
+	$HTTP_POST_VARS   = add_magic_quotes($HTTP_POST_VARS);
+	$HTTP_COOKIE_VARS = add_magic_quotes($HTTP_COOKIE_VARS);
+}
+
+$wpvarstoreset = array('action','standalone', 'option_group_id');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+	$wpvar = $wpvarstoreset[$i];
+	if (!isset($$wpvar)) {
+		if (empty($HTTP_POST_VARS["$wpvar"])) {
+			if (empty($HTTP_GET_VARS["$wpvar"])) {
+				$$wpvar = '';
+			} else {
+				$$wpvar = $HTTP_GET_VARS["$wpvar"];
+			}
+		} else {
+			$$wpvar = $HTTP_POST_VARS["$wpvar"];
+		}
+	}
+}
+
+require_once('optionhandler.php');
+
+
+$standalone = 0;
+include_once('admin-header.php');
+if ($user_level <= 3) {
+	die("You have no right to edit the options for this blog.<br />Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+}
+?>
+ <ul id="adminmenu2"> 
+  <li><a href="options-general.php">General</a></li> 
+  <li><a href="options-writing.php">Writing</a></li> 
+  <li><a class="current">Discussion</a></li> 
+  <?php
+    //we need to iterate through the available option groups.
+    $option_groups = $wpdb->get_results("SELECT group_id, group_name, group_desc, group_longdesc FROM $tableoptiongroups ORDER BY group_id");
+    foreach ($option_groups as $option_group) {
+        if ($option_group->group_id == $option_group_id) {
+            $current_desc=$option_group->group_desc;
+            $current_long_desc = $option_group->group_longdesc;
+            echo("  <li><a id=\"current2\" href=\"options.php?option_group_id={$option_group->group_id}\" title=\"{$option_group->group_desc}\">{$option_group->group_name}</a></li>\n");
+        } else {
+            echo("  <li><a href=\"options.php?option_group_id={$option_group->group_id}\" title=\"{$option_group->group_desc}\">{$option_group->group_name}</a></li>\n");
+        }
+    } // end for each group
+?> 
+  <li class="last"><a href="options-permalink.php">Permalinks</a></li> 
+</ul> 
+<br clear="all" /> 
+<div class="wrap"> 
+  <h2>Discussion Options</h2> 
+  <form name="form1" method="post" action="options.php"> 
+    <input type="hidden" name="action" value="update" /> 
+    <input type="hidden" name="page_options" value="'default_pingback_flag','default_ping_status','default_comment_status','use_smilies','comments_notify','moderation_notify','comment_moderation','moderation_keys'" /> 
+    <p>Usual settings for an article: <em>(These settings may be overidden for individual articles.)</em></p> 
+    <ul> 
+      <li> 
+        <label for="default_pingback_flag"> 
+        <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_settings('default_pingback_flag')); ?> /> 
+        Attempt to notify any Weblogs linked to from the article. (Slows down posting.)</label> 
+      </li> 
+      <li> 
+        <label for="default_ping_status"> 
+        <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_settings('default_ping_status')); ?> /> 
+        Allow link notifications from other Weblogs. (Pingbacks and trackbacks.)</label> 
+      </li> 
+      <li> 
+        <label for="default_comment_status"> 
+        <input name="default_comment_status" type="checkbox" id="default_comment_status" value="1" <?php checked('1', get_settings('default_comment_status')); ?> /> 
+        Allow people to post comments on the article</label> 
+      </li> 
+    </ul> 
+    <p>Email me whenever:</p> 
+    <ul> 
+      <li> 
+        <label for="comments_notify"> 
+        <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_settings('comments_notify')); ?> /> 
+        Anyone posts a comment </label> 
+      </li> 
+      <li> 
+        <label for="moderation_notify"> 
+        <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_settings('moderation_notify')); ?> /> 
+        A comment is approved or declined </label> 
+      </li> 
+    </ul> 
+    <p>Before a comment appears:</p> 
+    <ul> 
+      <li> 
+        <label for="comment_moderation"> 
+        <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> /> 
+        An administrator must approve the comment (regardless of any matches below) </label> 
+      </li> 
+    </ul> 
+    <p>When a comment contains any of these words in its content, name, URI, or email, hold it in the moderation queue: (Seperate multiple words with new lines.)</p> 
+    <p> 
+      <textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%;"><?php echo get_settings('moderation_keys'); ?></textarea> 
+    </p> 
+    <p style="text-align: right;"> 
+      <input type="submit" name="Submit" value="Update Options" /> 
+    </p> 
+  </form> 
+</div> 
+<?php include("admin-footer.php") ?>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index e05742af00..b3c1d20581 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -46,6 +46,7 @@ if ($user_level <= 3) {
  <ul id="adminmenu2"> 
  	<li><a class="current">General</a></li>
 	<li><a href="options-writing.php">Writing</a></li>
+	<li><a href="options-discussion.php">Discussion</a></li>
   <?php
     //we need to iterate through the available option groups.
     $option_groups = $wpdb->get_results("SELECT group_id, group_name, group_desc, group_longdesc FROM $tableoptiongroups ORDER BY group_id");
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index ecec4b3dcc..e33f01e502 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -46,6 +46,7 @@ if ($user_level <= 3) {
  <ul id="adminmenu2"> 
   <li><a href="options-general.php">General</a></li> 
   <li><a class="current">Writing</a></li> 
+  <li><a href="options-discussion.php">Discussion</a></li>
   <?php
     //we need to iterate through the available option groups.
     $option_groups = $wpdb->get_results("SELECT group_id, group_name, group_desc, group_longdesc FROM $tableoptiongroups ORDER BY group_id");
@@ -68,34 +69,39 @@ if ($user_level <= 3) {
     <input type="hidden" name="action" value="update" /> 
     <input type="hidden" name="page_options" value="'default_post_edit_rows','blog_charset','use_smilies','use_balanceTags','advanced_edit','ping_sites'" /> 
     <table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+      <tr valign="top">
+        <th scope="row"> When starting a post, show: </th>
+        <td><label>
+          <input name="advanced_edit" type="radio" value="0" <?php checked('0', get_settings('advanced_edit')); ?> />
+Simple controls</label>
+          <br />
+          <label>
+          <input name="advanced_edit" type="radio" value="1" <?php checked('1', get_settings('advanced_edit')); ?> />
+Advanced controls</label>
+          <label for="advanced_edit"></label></td>
+      </tr>
       <tr valign="top"> 
         <th width="33%" scope="row"> Size of the writing box:</th> 
         <td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php echo get_settings('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " /> 
           lines </td> 
       </tr> 
+      <tr valign="top">
+        <th scope="row">Formatting:</th>
+        <td>          <label for="label">
+          <input name="use_smilies" type="checkbox" id="label" value="1" <?php checked('1', get_settings('use_smilies')); ?> />
+  Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics</label>        
+            on display <br />          <label for="label2">
+  <input name="use_balanceTags" type="checkbox" id="label2" value="1" <?php checked('1', get_settings('use_balanceTags')); ?> />
+  WordPress should correct invalidly nested XHTML automatically</label></td>
+      </tr>
       <tr valign="top"> 
-        <th scope="row">Character Setting: </th> 
+        <th scope="row">Character Encoding: </th> 
         <td><input name="blog_charset" type="text" id="blog_charset" value="<?php echo get_settings('blog_charset'); ?>" size="20" class="code" /> 
           <br /> 
-          The charset you write your blog in (UTF-8 recommended<a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html"></a>)</td> 
+          The character encoding you write your blog in (UTF-8 recommended<a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html"></a>)</td> 
       </tr> 
     </table> 
-    <p> 
-      <label for="use_smilies"> 
-      <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> /> 
-      Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics.</label> 
-    </p> 
-    <p> 
-      <label for="use_balanceTags"> 
-      <input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_settings('use_balanceTags')); ?> /> 
-      WordPress should correct invalidly nested XHTML automatically.</label> 
-    </p> 
-    <p> 
-      <label for="advanced_edit"> 
-      <input name="advanced_edit" type="checkbox" id="advanced_edit" value="1" <?php checked('1', get_settings('advanced_edit')); ?> /> 
-      Compose posts using the advanced interface by default.</label> 
-    </p> 
-	<fieldset>
+    <fieldset>
 	<legend>Update Services</legend>
 	<p>Enter the sites that you would like to notify when you publish a new post. For a list of some recommended sites to ping please see [LINK TO SOMETHING]. Seperate multiple URIs by line breaks.</p>
 	
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 855df4a205..533c95e13a 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -780,6 +780,11 @@ function upgrade_110() {
 	if(!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'advanced_edit'")) {
 		$wpdb->query("INSERT INTO $tableoptions (option_name, option_type, option_value, option_admin_level) VALUES ('advanced_edit', 3, '0', 8)");
 	}
+	
+	// Now an option for moderation words
+	if(!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'moderation_keys'")) {
+		$wpdb->query("INSERT INTO $tableoptions (option_name, option_type, option_value, option_admin_level) VALUES ('moderation_keys', 3, '', 8)");
+	}
 }
 
 ?>
\ No newline at end of file