diff --git a/wp-content/themes/default/attachment.php b/wp-content/themes/default/image.php
similarity index 74%
rename from wp-content/themes/default/attachment.php
rename to wp-content/themes/default/image.php
index 7176d1b76..d8e36fd36 100644
--- a/wp-content/themes/default/attachment.php
+++ b/wp-content/themes/default/image.php
@@ -4,12 +4,8 @@
 
   <?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_attribute(); ?>"><?php the_title(); ?></a></h2>
+			<h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <?php the_title(); ?></h2>
 			<div class="entry">
 				<p class="attachment"><?php echo wp_get_attachment_link(0, 'medium', false); ?></p>
 
@@ -17,14 +13,15 @@
 
 				<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
 
+				<div class="navigation">
+					<div class="alignleft"><?php previous_image_link() ?></div>
+					<div class="alignright"><?php next_image_link() ?></div>
+				</div>
+				<br class="clear" />
+
 				<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() ?>
+						This entry was posted 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 post_comments_feed_link('RSS 2.0'); ?> feed.
 
@@ -50,6 +47,7 @@
 				</p>
 
 			</div>
+
 		</div>
 
 	<?php comments_template(); ?>
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 89e99c41a..05f6b831b 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -338,4 +338,27 @@ function gallery_shortcode($attr) {
 	return $output;
 }
 
+function previous_image_link() {
+	adjacent_image_link(true);
+}
+
+function next_image_link() {
+	adjacent_image_link(false);
+}
+
+function adjacent_image_link($prev = true) {
+	global $post;
+	$post = get_post($post);
+	$attachments = array_values(get_children("post_parent=$post->post_parent&post_type=attachment&post_mime_type=image&orderby=\"menu_order ASC, ID ASC\""));
+
+	foreach ( $attachments as $k => $attachment )
+		if ( $attachment->ID == $post->ID )
+			break;
+
+	$k = $prev ? $k - 1 : $k + 1;
+
+	if ( isset($attachments[$k]) )
+		echo get_the_attachment_link($attachments[$k]->ID, true, array(128, 96), true);
+}
+
 ?>