diff --git a/wp-admin/js/upload.js b/wp-admin/js/upload.js
index 6eca5705bb..d38cdcb036 100644
--- a/wp-admin/js/upload.js
+++ b/wp-admin/js/upload.js
@@ -201,6 +201,7 @@ addLoadEvent( function() {
 			h += "<td><textarea name='post_content' id='post_content'>" + this.currentImage.description + "</textarea></td>";
 			h += "</tr><tr id='buttons' class='submit'><td colspan='2'><input type='button' id='delete' name='delete' class='delete alignleft' value='" + this.deleteText + "' onclick='theFileList.deleteFile(" + id + ");' />";
 			h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />";
+			h += "<input type='hidden' name='post_parent' value='" + parseInt(this.postID,10) + "' />";
 			h += "<input type='hidden' name='action' id='action-value' value='save' />";
 			h += "<input type='hidden' name='ID' value='" + id + "' />";
 			h += "<input type='hidden' name='_wpnonce' value='" + this.nonce + "' />";
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 080eb6bf22..89e2175ba2 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -1272,7 +1272,7 @@ function is_local_attachment($url) {
 	return false;
 }
 
-function wp_insert_attachment($object, $file = false, $post_parent = 0) {
+function wp_insert_attachment($object, $file = false, $parent = 0) {
 	global $wpdb, $user_ID;
 
 	$defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,
@@ -1280,6 +1280,9 @@ function wp_insert_attachment($object, $file = false, $post_parent = 0) {
 		'menu_order' => 0, 'to_ping' =>  '', 'pinged' => '', 'post_password' => '');
 
 	$object = wp_parse_args($object, $defaults);
+	if ( !empty($parent) )
+		$object['post_parent'] = $parent;
+
 	$object = sanitize_post($object, 'db');
 
 	// export array as variables