Index: wp-content/themes/twentythirteen/style.css
===================================================================
--- wp-content/themes/twentythirteen/style.css	(revision 23795)
+++ wp-content/themes/twentythirteen/style.css	(working copy)
@@ -1643,6 +1643,15 @@
 	font-weight: bold;
 }
 
+.format-image .entry-header {
+	max-width: 724px;
+}
+
+.format-image .entry-header img {
+	height: auto;
+	max-width: 724px;
+}
+
 .format-image .entry-content .size-full {
 	margin: 0 -60px;
 	max-width: 724px;
@@ -1854,6 +1863,10 @@
 	font-weight: 400;
 }
 
+.format-video .entry-header {
+	max-width: 724px;
+}
+
 .format-video .entry-meta {
 	color: #220e10;
 }
Index: wp-content/themes/twentythirteen/content-image.php
===================================================================
--- wp-content/themes/twentythirteen/content-image.php	(revision 23795)
+++ wp-content/themes/twentythirteen/content-image.php	(working copy)
@@ -10,6 +10,8 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
+		<?php twentythirteen_post_image(); ?>
+
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 		<?php else : ?>
@@ -20,7 +22,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php twentythirteen_split_content(); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->
 
Index: wp-content/themes/twentythirteen/functions.php
===================================================================
--- wp-content/themes/twentythirteen/functions.php	(revision 23795)
+++ wp-content/themes/twentythirteen/functions.php	(working copy)
@@ -436,6 +436,114 @@
 	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
 }
 
+/**
+ * Echoes the first found video from current post.
+ *
+ * @uses twentythirteen_get_split_content
+ *
+ * @print HTML
+ */
+function twentythirteen_post_video() {
+	$first_video = twentythirteen_get_split_content( 'url' );
+
+	if ( is_array( $first_video ) )
+		$first_video = $first_video[0];
+
+	echo wp_oembed_get( $first_video );
+}
+
+/**
+ * Echoes the first found image from current post.
+ *
+ * @uses twentythirteen_get_split_content
+ *
+ * @print HTML
+ */
+function twentythirteen_post_image() {
+	$first_image = twentythirteen_get_split_content( 'url' );
+
+	if ( is_array( $first_image ) )
+		$first_image = array_shift( $first_image );
+
+	if ( is_string( $first_image ) ) {
+		echo '<img' . ' src="' . $first_image .'" alt="" />';
+/*
+	@todo Update core functions to return the image HTML instead of just the src attribute value
+
+	get_content_images()
+	get_content_image()
+
+	Add an option to return <img /> HTML string instead of just the `src` attribute value.
+
+	Or, return the attachment ID if the image string looks like an attachment
+
+	That'd be even better -- since we could then use `wp_get_attachment_image()` to output the image instead of a) trusting the returned HTML and b) trying to build the image HTML string from scratch.
+*/		
+	} else if ( is_object( $first_image ) ) {
+		echo wp_get_attachment_image( $first_image->ID, array( 724, 724 ) );
+	}
+}
+
+/**
+ * Echoes the post content without the chosen piece of media (video, image, etc).
+ *
+ * @uses twentythirteen_get_split_content
+ *
+ * @print HTML
+ */
+function twentythirteen_split_content() {
+	echo twentythirteen_get_split_content( 'rest' );
+}
+
+/**
+ * Finds first media piece in a given post.
+ *
+ * 1. Find a URL or media embed in post format meta.
+ * 2. Find a source element in post content.
+ * 3. Find an embed in post content.
+ * 4. Find an attachment.
+ *
+ * @param string $return Whether to return the URL or the filtered content.
+ * @return mixed string: URL of the first media piece found, or the rest of the content without the piece
+ * or array if finding image attachments.
+ */
+function twentythirteen_get_split_content( $return = 'url' ) {
+	$format       = get_post_format();
+	$post_content = get_the_content();
+	$media_item   = '';
+
+	if ( 'video' == $format ) {
+		$post_meta = get_post_format_meta( get_the_ID() );
+
+		$media_item = $post_meta['url'];
+
+		if ( empty( $media_item ) ) {
+			$media_item = $post_meta['media'];
+
+			if ( empty( $media_item ) ) {
+			 	$media_item = get_content_video( $post_content, true );
+
+				if ( empty( $media_item ) ) {
+					$media_item = get_embedded_video( $post_content, true );
+
+					if ( empty( $media_item ) )
+						$media_item = get_attached_video( get_the_ID() );
+				}
+			}
+		}		
+	} else if ( 'image' == $format ) {
+	 	$media_item = get_content_image( $post_content, true );
+
+		if ( empty( $media_item ) )
+			$media_item = get_attached_images( get_the_ID() );
+	}
+
+	if ( 'rest' === $return )
+		return $post_content;
+
+	return $media_item;
+}
+
 if ( ! function_exists( 'twentythirteen_featured_gallery' ) ) :
 /**
  * Displays first gallery from post content. Changes image size from thumbnail
Index: wp-content/themes/twentythirteen/content-video.php
===================================================================
--- wp-content/themes/twentythirteen/content-video.php	(revision 23795)
+++ wp-content/themes/twentythirteen/content-video.php	(working copy)
@@ -10,6 +10,8 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
+		<?php twentythirteen_post_video(); ?>
+
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 		<?php else : ?>
@@ -20,7 +22,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php twentythirteen_split_content(); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->