diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 1c8596faee..82d39ed0bd 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -63,15 +63,17 @@ window.onload = focusit;
 	  <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post_status, 'private'); ?> /> Private</label></div>
     </fieldset>
     <fieldset id="commentstatusdiv">
-      <legend><a href="http://wordpress.org/docs/reference/post/#comments" title="Help on comment status">Comments</a></legend> 
-	  <div><label for="comment_status_open" class="selectit"><input id="comment_status_open" name="comment_status" type="radio" value="open" <?php checked($comment_status, 'open'); ?> /> Open</label> 
-	  <label for="comment_status_closed" class="selectit"><input id="comment_status_closed" name="comment_status" type="radio" value="closed" <?php checked($comment_status, 'closed'); ?> /> Closed</label></div>
-    </fieldset>
-    <fieldset id="pingstatusdiv">
-      <legend><a href="http://wordpress.org/docs/reference/post/#pings" title="Help on ping status">Pings</a></legend> 
-	  <div><label for="ping_status_open" class="selectit"><input id="ping_status_open" name="ping_status" type="radio" value="open" <?php checked($ping_status, 'open'); ?> /> Open</label> 
-	  <label for="ping_status_closed" class="selectit"><input id="ping_status_closed" name="ping_status" type="radio" value="closed" <?php checked($ping_status, 'closed'); ?> /> Closed</label></div>
-    </fieldset>
+      <legend><a href="http://wordpress.org/docs/reference/post/#comments" title="Help on comment status">Discussion</a></legend> 
+	  <div><label for="comment_status" class="selectit">
+	      <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($comment_status, 'open'); ?> />
+         Allow Comments</label> 
+		 <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($ping_status, 'open'); ?> /> Allow Pings</label>
+</div>
+</fieldset>
+<fieldset id="slugdiv">
+<legend>Post Slug</legend>
+<div><input name="post_name" type="text" size="17" id="post_name" value="<?php echo $post_name ?>" /></div>
+</fieldset>
     <fieldset id="postpassworddiv">
       <legend><a href="http://wordpress.org/docs/reference/post/#post_password" title="Help on post password">Post Password</a></legend> 
 	  <div><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post_password ?>" /></div>
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 114765a1f3..c888fe371f 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -221,6 +221,7 @@ switch($action) {
 			$post_password = $postdata['post_password'];
 			$to_ping = $postdata['to_ping'];
 			$pinged = $postdata['pinged'];
+			$post_name = $postdata['post_name'];
 
             include('edit-form-advanced.php');
 			$p = $_GET['post'];
@@ -288,7 +289,8 @@ switch($action) {
 			$ping_status = $HTTP_POST_VARS['ping_status'];
 			if (empty($ping_status)) $post_status = get_settings('default_ping_status');
 			$post_password = addslashes($HTTP_POST_VARS['post_password']);
-			$post_name = sanitize_title($post_title);
+			$post_name = sanitize_title($_POST['post_name']);
+			if (empty($post_name)) $post_name = sanitize_title($post_title);
 			$trackback = $HTTP_POST_VARS['trackback_url'];
 		// Format trackbacks
 		$trackback = preg_replace('|\s+|', '\n', $trackback);
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 455e0232a7..8f4b0f42d7 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -283,10 +283,14 @@ textarea, input, select {
 	clear: both;
 }
 
-#poststatusdiv, #commentstatusdiv, #pingstatusdiv {
+#poststatusdiv, #pingstatusdiv, #commentstatusdiv {
 	width: 6.5em;
 }
 
+#slugdiv {
+	width: 9.4em;
+}
+
 #poststuff {
 	margin-right: 11em;
 }
@@ -321,7 +325,7 @@ textarea, input, select {
 	text-align: right;
 }
 
-#titlediv, #poststatusdiv, #commentstatusdiv, #pingstatusdiv, #postpassworddiv, #namediv, #uridiv, #emaildiv {
+#titlediv, #poststatusdiv, #commentstatusdiv, #slugdiv, #postpassworddiv, #namediv, #uridiv, #emaildiv {
 	float: left;
 	height: 6em;
 	margin-right: 5px;
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index da6067c724..c875b48d34 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -325,7 +325,8 @@ function get_postdata($postid) {
 		'ping_status' => $post->ping_status,
 		'post_password' => $post->post_password,
 		'to_ping' => $post->to_ping,
-		'pinged' => $post->pinged
+		'pinged' => $post->pinged,
+		'post_name' => $post->post_name
 	);
 	return $postdata;
 }