diff --git wp-admin/css/wp-admin.css wp-admin/css/wp-admin.css
index 30c8080..b1340b9 100644
--- wp-admin/css/wp-admin.css
+++ wp-admin/css/wp-admin.css
@@ -3089,11 +3089,46 @@ input#link_url {
 	margin: 2px 0 2px -2px;
 }
 
-#post-status-select, #post-format {
+#post-status-select {
 	line-height: 2.5em;
 	margin-top: 3px;
 }
 
+/* Post formats form */
+#post-body-content.wp-format-standard .post-formats-fields,
+#post-body-content.wp-format-aside .post-formats-fields,
+#post-body-content.wp-format-status .post-formats-fields,
+#post-body-content.wp-format-chat .post-formats-fields,
+#post-body-content.wp-format-link .wp_format_quote,
+#post-body-content.wp-format-gallery .wp_format_quote,
+#post-body-content.wp-format-image .wp_format_quote,
+#post-body-content.wp-format-video .wp_format_quote,
+#post-body-content.wp-format-audio .wp_format_quote,
+#post-body-content.wp-format-link .wp_format_quote_source,
+#post-body-content.wp-format-gallery .wp_format_quote_source,
+#post-body-content.wp-format-image .wp_format_quote_source,
+#post-body-content.wp-format-video .wp_format_quote_source,
+#post-body-content.wp-format-audio .wp_format_quote_source,
+#post-body-content.wp-format-gallery .wp_format_url,
+#post-body-content.wp-format-video .wp_format_url,
+#post-body-content.wp-format-audio .wp_format_url,
+#post-body-content.wp-format-link .wp_format_image,
+#post-body-content.wp-format-gallery .wp_format_image,
+#post-body-content.wp-format-quote .wp_format_image,
+#post-body-content.wp-format-video .wp_format_image,
+#post-body-content.wp-format-audio .wp_format_image,
+#post-body-content.wp-format-link .wp_format_gallery,
+#post-body-content.wp-format-image .wp_format_gallery,
+#post-body-content.wp-format-quote .wp_format_gallery,
+#post-body-content.wp-format-video .wp_format_gallery,
+#post-body-content.wp-format-audio .wp_format_gallery,
+#post-body-content.wp-format-link .wp_format_media,
+#post-body-content.wp-format-gallery .wp_format_media,
+#post-body-content.wp-format-image .wp_format_media,
+#post-body-content.wp-format-quote .wp_format_media {
+	display: none;
+}
+
 /* Post Screen */
 #post-body #normal-sortables {
 	min-height: 50px;
diff --git wp-admin/edit-form-advanced.php wp-admin/edit-form-advanced.php
index 7d142d9..07393c7 100644
--- wp-admin/edit-form-advanced.php
+++ wp-admin/edit-form-advanced.php
@@ -112,9 +112,6 @@ if ( 'attachment' == $post_type ) {
 	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' );
 }
 
-if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
-	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
-
 // all taxonomies
 foreach ( get_object_taxonomies( $post ) as $tax_name ) {
 	$taxonomy = get_taxonomy($tax_name);
@@ -129,6 +126,14 @@ foreach ( get_object_taxonomies( $post ) as $tax_name ) {
 		add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
 }
 
+// post format
+$post_format = get_post_format();
+$format_class = '';
+if ( ! $post_format && post_type_supports( $post_type, 'post-formats' ) )
+	$post_format = 'standard';
+if ( $post_format )
+	$format_class = " class='wp-format-{$post_format}'";
+
 if ( post_type_supports($post_type, 'page-attributes') )
 	add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
 
@@ -322,8 +327,25 @@ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
 <div id="poststuff">
 
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
-<div id="post-body-content">
-<?php if ( post_type_supports($post_type, 'title') ) { ?>
+<div id="post-body-content"<?php echo $format_class; ?>>
+
+<?php
+if ( post_type_supports( $post_type, 'post-formats' ) ) {
+	$all_post_formats = get_post_format_strings();
+
+	echo '<h2 class="nav-tab-wrapper post-format-select">';
+
+	foreach ( $all_post_formats as $slug => $label ) {
+		$class = $post_format == $slug ? 'nav-tab nav-tab-active' : 'nav-tab';
+
+		echo '<a class="' . $class . '" href="?format=' . $slug . '" data-wp-format="' . $slug . '">' . $label . '</a>';
+	}
+
+	echo '</h2>';
+}
+?>
+
+<?php if ( post_type_supports( $post_type, 'title' ) ) { ?>
 <div id="titlediv">
 <div id="titlewrap">
 	<label class="screen-reader-text" id="title-prompt-text" for="title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?></label>
@@ -356,7 +378,61 @@ wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
 
 do_action( 'edit_form_after_title' );
 
-if ( post_type_supports($post_type, 'editor') ) {
+// post format fields
+if ( post_type_supports( $post_type, 'post-formats' ) ) {
+	$format_meta = get_post_format_meta( $post_ID );
+?>
+<div class="post-formats-fields">
+
+<input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
+
+<div class="wp_format_quote">
+	<label for="_wp_format_quote"><?php _e( 'Quote' ); ?>:</label>
+	<textarea name="_wp_format_quote" class="widefat"><?php
+		if ( isset( $format_meta['quote'] ) )
+			echo esc_textarea( $format_meta['quote'] ); ?></textarea>
+</div>
+
+<div class="wp_format_quote_source">
+	<label for="_wp_format_quote_source"><?php _e( 'Source' ); ?>:</label>
+	<input type="text" name="_wp_format_quote_source" value="<?php
+		if ( isset( $format_meta['quote_source'] ) )
+			echo esc_attr( $format_meta['quote_source'] ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_url">
+	<label for="_wp_format_url"><?php _e( 'URL' ); ?>:</label>
+	<input type="text" name="_wp_format_url" value="<?php
+		if ( isset( $format_meta['url'] ) )
+			echo esc_url( $format_meta['url'] ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_image">
+	<label for="_wp_format_image"><?php _e( 'Image' ); ?>:</label>
+	<input type="text" name="_wp_format_image" value="<?php
+		if ( isset( $format_meta['image'] ) )
+			echo esc_attr( $format_meta['image'] ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_gallery">
+	<label for="_wp_format_gallery"><?php _e( 'Gallery' ); ?>:</label>
+	<input type="text" name="_wp_format_gallery" value="<?php
+		if ( isset( $format_meta['gallery'] ) )
+			echo esc_attr( $format_meta['gallery'] ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_media">
+	<label for="_wp_format_media"><?php _e( 'Media' ); ?>:</label>
+	<textarea name="_wp_format_media" class="widefat"><?php
+		if ( isset( $format_meta['media'] ) )
+			echo esc_textarea( $format_meta['media'] ); ?></textarea>
+</div>
+
+</div>
+<?php
+}
+
+if ( post_type_supports( $post_type, 'editor' ) ) {
 ?>
 <div id="postdivrich" class="postarea">
 
diff --git wp-admin/includes/post.php wp-admin/includes/post.php
index e4866ad..7f61675 100644
--- wp-admin/includes/post.php
+++ wp-admin/includes/post.php
@@ -193,12 +193,18 @@ function edit_post( $post_data = null ) {
 
 	// Post Formats
 	if ( isset( $post_data['post_format'] ) ) {
-		if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
-		elseif ( '0' == $post_data['post_format'] )
-			set_post_format( $post_ID, false );
+		set_post_format( $post_ID, $post_data['post_format'] );
+	}
+
+	$format_keys = array( 'quote', 'quote_source', 'image', 'gallery', 'media' );
+	foreach ( $format_keys as $key ) {
+		if ( isset( $post_data[ '_wp_format_' . $key ] ) )
+			update_post_meta( $post_ID, '_wp_format_' . $key, addslashes( wp_kses_post( stripslashes( $post_data['_wp_format_quote'] ) ) ) );
 	}
 
+	if ( isset( $post_data[ '_wp_format_url' ] ) )
+		update_post_meta( $post_ID, '_wp_format_url', addslashes( esc_url_raw( stripslashes( $post_data['_wp_format_url'] ) ) ) );
+
 	// Meta Stuff
 	if ( isset($post_data['meta']) && $post_data['meta'] ) {
 		foreach ( $post_data['meta'] as $key => $value ) {
diff --git wp-admin/js/post.js wp-admin/js/post.js
index 15b7a9f..1e02b98 100644
--- wp-admin/js/post.js
+++ wp-admin/js/post.js
@@ -791,4 +791,14 @@ jQuery(document).ready( function($) {
 			});
 		});
 	}
+
+	// Post formats selection
+	$('.post-format-select a').on( 'click', function(e){
+		e.preventDefault();
+		var elem = $(e.currentTarget);
+		$('.post-format-select a.nav-tab-active').removeClass('nav-tab-active');
+		elem.addClass('nav-tab-active').blur();
+		$('#post_format').val(elem.data('wp-format'));
+		$('#post-body-content').attr('class', 'wp-format-' + elem.data('wp-format'));
+	});
 });