Index: wp-content/themes/twentyfifteen/image.php
===================================================================
--- wp-content/themes/twentyfifteen/image.php	(revision 29938)
+++ wp-content/themes/twentyfifteen/image.php	(working copy)
@@ -26,27 +26,28 @@
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<?php
-							/**
-							 * Filter the default Twenty Fifteen image attachment size.
-							 *
-							 * @since Twenty Fifteen 1.0
-							 *
-							 * @param string $image_size Image size. Default 'large'.
-							 */
-							$image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
-							echo wp_get_attachment_image( get_the_ID(), $image_size );
+						<div class="entry-attachment">
+							<?php
+								/**
+								 * Filter the default Twenty Fifteen image attachment size.
+								 *
+								 * @since Twenty Fifteen 1.0
+								 *
+								 * @param string $image_size Image size. Default 'large'.
+								 */
+								$image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
+								echo wp_get_attachment_image( get_the_ID(), $image_size );
+							?>
 
-							the_content();
-						?>
+							<?php if ( has_excerpt() ) : ?>
+								<div class="entry-caption">
+									<?php the_excerpt(); ?>
+								</div><!-- .entry-caption -->
+							<?php endif; ?>
+						</div><!-- .entry-attachment -->
 
-						<?php if ( has_excerpt() ) : ?>
-							<div class="entry-caption">
-								<?php the_excerpt(); ?>
-							</div><!-- .entry-caption -->
-						<?php endif; ?>
-
 						<?php
+							the_content();
 							wp_link_pages( array(
 								'before'      => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
 								'after'       => '</div>',
Index: wp-content/themes/twentyfifteen/style.css
===================================================================
--- wp-content/themes/twentyfifteen/style.css	(revision 29938)
+++ wp-content/themes/twentyfifteen/style.css	(working copy)
@@ -1999,8 +1999,8 @@
 	width: auto;
 }
 
-.type-attachment .entry-header {
-	clear: right;
+.entry-attachment {
+	margin-bottom: 1.6em;
 }
 
 .type-attachment .entry-title {
@@ -2022,6 +2022,7 @@
 	-ms-hyphens: auto;
 	hyphens: auto;
 	line-height: 1.5;
+	padding-top: 0.5em;
 	word-wrap: break-word;
 }
 
@@ -3157,6 +3158,10 @@
 		margin-bottom: 1.5294em;
 	}
 
+	.entry-attachment {
+		margin-bottom: 1.6471em;
+	}
+
 	.format-aside .entry-title,
 	.format-image .entry-title,
 	.format-video .entry-title,
@@ -3689,6 +3694,10 @@
 		margin-bottom: 1.5789em;
 	}
 
+	.entry-attachment {
+		margin-bottom: 1.6842em
+	}
+
 	.format-aside .entry-title,
 	.format-image .entry-title,
 	.format-video .entry-title,
@@ -4344,6 +4353,10 @@
 		margin-bottom: 1.4667em;
 	}
 
+	.entry-attachment {
+		margin-bottom: 1.6em;
+	}
+
 	.format-aside .entry-title,
 	.format-image .entry-title,
 	.format-video .entry-title,
@@ -4862,6 +4875,10 @@
 		margin-bottom: 1.5294em;
 	}
 
+	.entry-attachment {
+		margin-bottom: 1.6471em;
+	}
+
 	.format-aside .entry-title,
 	.format-image .entry-title,
 	.format-video .entry-title,
@@ -5376,6 +5393,10 @@
 		margin-bottom: 1.5789em;
 	}
 
+	.entry-attachment {
+		margin-bottom: 1.6842em;
+	}
+
 	.format-aside .entry-title,
 	.format-image .entry-title,
 	.format-video .entry-title,