diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index a5291f1e8..db3778057 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -97,6 +97,14 @@ function fix_attachment_links($post_ID) {
 			continue;
 
 		$id = $id_matches[2];
+
+		// While we have the attachment ID, let's adopt any orphans.
+		$attachment = & get_post($id);
+		if ( ! is_object(get_post($attachment->post_parent)) ) {
+			$attachment->post_parent = $post_ID;
+			wp_update_post($attachment);
+		}
+
 		$post_search[$i] = $anchor;
 		$post_replace[$i] = preg_replace("#href=(\"|')[^'\"]*\\1#e", "stripslashes('href=\\1').get_attachment_link($id).stripslashes('\\1')", $anchor);
 		++$i;
diff --git a/wp-admin/inline-uploading.php b/wp-admin/inline-uploading.php
index 680ec8871..682797f82 100644
--- a/wp-admin/inline-uploading.php
+++ b/wp-admin/inline-uploading.php
@@ -158,6 +158,7 @@ if ( count($attachments) > 0 ) {
 	$__not_linked = __('Not Linked');
 	$__linked_to_page = __('Linked to Page');
 	$__linked_to_image = __('Linked to Image');
+	$__linked_to_file = __('Linked to File');
 	$__using_thumbnail = __('Using Thumbnail');
 	$__using_original = __('Using Original');
 	$__no_thumbnail = __('<del>No Thumbnail</del>');
@@ -167,11 +168,13 @@ if ( count($attachments) > 0 ) {
 	$script .= "notlinked = '$__not_linked';
 linkedtoimage = '$__linked_to_image';
 linkedtopage = '$__linked_to_page';
+linkedtofile = '$__linked_to_file';
 usingthumbnail = '$__using_thumbnail';
 usingoriginal = '$__using_original';
 ";
 	foreach ( $attachments as $key => $attachment ) {
 		$ID = $attachment['ID'];
+		$href = get_attachment_link($ID);
 		$meta = get_post_meta($ID, '_wp_attachment_metadata', true);
 		if (!is_array($meta)) {
 			$meta = get_post_meta($ID, 'imagedata', true); // Try 1.6 Alpha meta key
@@ -204,7 +207,6 @@ src{$ID}b = '{$image['guid']}';
 			$xpadding = (128 - $image['uwidth']) / 2;
 			$ypadding = (96 - $image['uheight']) / 2;
 			$style .= "#target{$ID} img { padding: {$ypadding}px {$xpadding}px; }\n";
-			$href = get_attachment_link($ID);
 			$script .= "a{$ID}a = '<a id=\"{$ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$image['post_title']}\">';
 a{$ID}b = '<a class=\"imagelink\" href=\"{$image['guid']}\" onclick=\"doPopup({$ID});return false;\" title=\"{$image['post_title']}\">';
 img{$ID}a = '<img id=\"image{$ID}\" src=\"$src\" alt=\"{$image['post_title']}\" $height_width />';
@@ -222,9 +224,13 @@ img{$ID}b = '<img id=\"image{$ID}\" src=\"{$image['guid']}\" alt=\"{$image['post
 </div>
 ";
 		} else {
+			$script .= "a{$ID}a = '<a id=\"{$ID}\" rel=\"attachment\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$attachment['post_title']}\">{$attachment['post_title']}</a>';
+a{$ID}b = '<a id=\"{$ID}\" href=\"{$attachment['guid']}\" onclick=\"doPopup({$ID});return false;\" title=\"{$attachment['post_title']}\">{$attachment['post_title']}</a>';
+";
 			$html .= "<div id='target{$ID}' class='attwrap left'>
 	<div id='popup{$ID}' class='popup'>
 		<div class='filetype'>File Type: ".str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
+		<a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>
 		{$delete_cancel}
 	</div>
 	<div id='div{$ID}' class='otherwrap' onmousedown=\"selectLink({$ID})\" onclick=\"doPopup({$ID});return false;\">
@@ -299,6 +305,17 @@ function toggleLink(n) {
 		ol.innerHTML = notlinked;
 	}
 }
+function toggleOtherLink(n) {
+	od=document.getElementById('div'+n);
+	ol=document.getElementById('L'+n);
+	if ( ol.innerHTML == linkedtofile ) {
+		od.innerHTML = eval('a'+n+'a');
+		ol.innerHTML = linkedtopage;
+	} else {
+		od.innerHTML = eval('a'+n+'b');
+		ol.innerHTML = linkedtofile;
+	}
+}
 function toggleImage(n) {
 	o = document.getElementById('image'+n);
 	oi = document.getElementById('I'+n);
diff --git a/wp-content/themes/default/attachment.php b/wp-content/themes/default/attachment.php
new file mode 100644
index 000000000..6a31a61f2
--- /dev/null
+++ b/wp-content/themes/default/attachment.php
@@ -0,0 +1,79 @@
+<?php get_header(); ?>
+
+	<div id="content" class="widecolumn">
+				
+  <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
+	
+		<div class="navigation">
+			<div class="alignleft">&nbsp;</div>
+			<div class="alignright">&nbsp;</div>
+		</div>
+		<div class="post" id="post-<?php the_ID(); ?>">
+			<h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+			<div class="entrytext">
+<?php	$type = explode('/', $post->post_mime_type);
+	switch ( $type[0] ) {
+	case 'image' :
+		$meta = get_post_meta($post->ID, '_wp_attachment_metadata', true);
+		if ($meta['width'] > 450) : ?>
+				<p><a href="<?php echo $post->guid; ?>" title="<?php echo $post->post_title.': '.$meta['width'].'x'.$meta['height'] ?>"><img class="centered" src="<?php echo $post->guid; ?>" alt="<?php the_title(); ?>" style="width:450px;" /></a></p>
+<?php		else : ?>
+				<p><img class="centered" src="<?php echo $post->guid; ?>" alt="<?php the_title(); ?>" /></p>
+<?php		endif;
+		break;
+	default :
+?>
+				<p><a href="<?php echo $post->guid; ?>"><?php echo basename($post->guid); ?></a></p>
+<?php
+	}
+?>
+				<?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
+	
+				<?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
+	
+				<p class="postmetadata alt">
+					<small>
+						This entry was posted
+						<?php /* This is commented, because it requires a little adjusting sometimes.
+							You'll need to download this plugin, and follow the instructions:
+							http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
+							/* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?> 
+						on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
+						and is filed under <?php the_category(', ') ?>.
+						You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed. 
+						
+						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
+							// Both Comments and Pings are open ?>
+							You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
+						
+						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
+							// Only Pings are Open ?>
+							Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
+						
+						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
+							// Comments are open, Pings are not ?>
+							You can skip to the end and leave a response. Pinging is currently not allowed.
+			
+						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
+							// Neither Comments, nor Pings are open ?>
+							Both comments and pings are currently closed.			
+						
+						<?php } edit_post_link('Edit this entry.','',''); ?>
+						
+					</small>
+				</p>
+	
+			</div>
+		</div>
+		
+	<?php comments_template(); ?>
+	
+	<?php endwhile; else: ?>
+	
+		<p>Sorry, no attachments matched your criteria.</p>
+	
+<?php endif; ?>
+	
+	</div>
+
+<?php get_footer(); ?>