Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 22076)
+++ wp-admin/options-permalink.php	(working copy)
@@ -186,6 +186,7 @@
 	2 => $prefix . '/%year%/%monthnum%/%postname%/',
 	3 => $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
 	4 => $prefix . '/%postname%/',
+	5 => $prefix . '/%category%/%postname%/',
 );
 ?>
 <h3><?php _e('Common Settings'); ?></h3>
@@ -211,6 +212,10 @@
 		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
 	</tr>
 	<tr>
+		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[5]); ?>" class="tog" <?php checked($structures[5], $permalink_structure); ?> /> <?php _e('Post category and name'); ?></label></th>
+		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-category/sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+	</tr>
+	<tr>
 		<th>
 			<label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
 			<?php _e('Custom Structure'); ?>