diff --git a/wp-admin/export.php b/wp-admin/export.php
index 1a35e51fc1..5c86b68236 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -15,6 +15,25 @@ require_once ('admin-header.php');
 <p><?php _e('When you click the button below WordPress will create a XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>
 <form action="" method="get">
+<h3><?php _e('Optional options'); ?></h3>
+
+<table>
+<tr>
+<th><?php _e('Restrict Author:'); ?></th>
+<td>
+<select name="author">
+<option value="all" selected="selected"><?php _e('All'); ?></option>
+<?php
+$authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );  
+foreach ( $authors as $id ) {
+	$o = get_userdata( $id );
+	echo "<option value='$o->ID'>$o->display_name</option>";
+}
+?>
+</select>
+</td>
+</tr>
+</table>
 <p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />
 <input type="hidden" name="download" value="true" />
 </p>
@@ -25,14 +44,22 @@ require_once ('admin-header.php');
 <?php
 
 function export_wp() {
-	global $wpdb, $posts, $post;
-	$filename = 'wordpress.' . date('Y-m-d') . '.xml';
+global $wpdb, $posts, $post;
+
+$filename = 'wordpress.' . date('Y-m-d') . '.xml';
+
 header('Content-Description: File Transfer');
 header('Content-Type: application/octet-stream');
 header("Content-Disposition: attachment; filename=$filename");
 header('Content-type: text/wxr+xml; charset=' . get_option('blog_charset'), true);
-//$posts = query_posts('');
-$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt ASC");
+
+$where = '';
+if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) {
+	$author_id = (int) $_GET['author'];
+	$where = " WHERE post_author = '$author_id' ";
+}
+
+$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
 ?>
 <!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->
 <!-- It contains information about your blog's posts, comments, and categories. -->
@@ -71,6 +98,7 @@ $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt A
 <guid isPermaLink="false"><?php the_guid(); ?></guid>
 <description></description>
 <content:encoded><![CDATA[<?php echo $post->post_content ?>]]></content:encoded>
+<wp:post_id><?php echo $post->ID; ?></wp:post_id>
 <wp:post_date><?php echo $post->post_date; ?></wp:post_date>
 <wp:post_date_gmt><?php echo $post->post_date_gmt; ?></wp:post_date_gmt>
 <wp:comment_status><?php echo $post->comment_status; ?></wp:comment_status>
@@ -94,6 +122,7 @@ if ( $postmeta ) {
 $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID"); 
 if ( $comments ) { foreach ( $comments as $c ) { ?>
 <wp:comment>
+<wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>
 <wp:comment_author><?php echo $c->comment_author; ?></wp:comment_author>
 <wp:comment_author_email><?php echo $c->comment_author_email; ?></wp:comment_author_email>
 <wp:comment_author_url><?php echo $c->comment_author_url; ?></wp:comment_author_url>