Index: wp-content/themes/twentyeleven/tag.php
===================================================================
--- wp-content/themes/twentyeleven/tag.php	(revision 18138)
+++ wp-content/themes/twentyeleven/tag.php	(working copy)
@@ -1,52 +0,0 @@
-<?php
-/**
- * The template used to display Tag Archive pages
- *
- * @package WordPress
- * @subpackage Twenty_Eleven
- * @since Twenty Eleven 1.0
- */
-
-get_header(); ?>
-
-		<section id="primary">
-			<div id="content" role="main">
-
-				<?php the_post(); ?>
-
-				<header class="page-header">
-					<h1 class="page-title"><?php
-						printf( __( 'Tag Archives: %s', 'twentyeleven' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-					?></h1>
-
-					<?php
-						$tag_description = tag_description();
-						if ( ! empty( $tag_description ) )
-							echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
-					?>
-				</header>
-
-				<?php rewind_posts(); ?>
-
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php
-						/* Include the Post-Format-specific template for the content.
-						 * If you want to overload this in a child theme then include a file
-						 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
-					?>
-
-				<?php endwhile; ?>
-
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
-
-			</div><!-- #content -->
-		</section><!-- #primary -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
Index: wp-content/themes/twentyeleven/category.php
===================================================================
--- wp-content/themes/twentyeleven/category.php	(revision 18138)
+++ wp-content/themes/twentyeleven/category.php	(working copy)
@@ -1,48 +0,0 @@
-<?php
-/**
- * The template for displaying Category Archive pages.
- *
- * @package WordPress
- * @subpackage Twenty_Eleven
- * @since Twenty Eleven 1.0
- */
-
-get_header(); ?>
-
-		<section id="primary">
-			<div id="content" role="main">
-
-				<header class="page-header">
-					<h1 class="page-title"><?php
-						printf( __( 'Category Archives: %s', 'twentyeleven' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-					?></h1>
-
-					<?php
-						$category_description = category_description();
-						if ( ! empty( $category_description ) )
-							echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
-					?>
-				</header>
-
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php
-						/* Include the Post-Format-specific template for the content.
-						 * If you want to overload this in a child theme then include a file
-						 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
-					?>
-
-				<?php endwhile; ?>
-
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
-
-			</div><!-- #content -->
-		</section><!-- #primary -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
Index: wp-content/themes/twentyeleven/archive.php
===================================================================
--- wp-content/themes/twentyeleven/archive.php	(revision 18138)
+++ wp-content/themes/twentyeleven/archive.php	(working copy)
@@ -26,6 +26,11 @@
 					 */
 					if ( have_posts() )
 						the_post();
+
+					if ( is_category() || is_tag() || is_tax() ) {
+						$term = get_queried_object();
+						$taxonomy = get_taxonomy( $term->taxonomy );
+					}
 				?>
 
 				<header class="page-header">
@@ -36,10 +41,27 @@
 							<?php printf( __( 'Monthly Archives: %s', 'twentyeleven' ), '<span>' . get_the_date( 'F Y' ) . '</span>' ); ?>
 						<?php elseif ( is_year() ) : ?>
 							<?php printf( __( 'Yearly Archives: %s', 'twentyeleven' ), '<span>' . get_the_date( 'Y' ) . '</span>' ); ?>
+						<?php elseif ( is_category() || is_tag() || is_tax() ) : ?>
+							<?php
+							if ( isset( $taxonomy->labels->singular_name ) )
+								$taxonomy_name = $taxonomy->labels->singular_name;
+							else
+								$taxonomy_name = __( 'Taxonomy', 'twentyeleven' );
+
+							printf( __( '%1$s Archives: %2$s', 'twentyeleven' ), $taxonomy_name, '<span>' . single_term_title( '', false ) . '</span>' );
+							?>
 						<?php else : ?>
 							<?php _e( 'Blog Archives', 'twentyeleven' ); ?>
 						<?php endif; ?>
 					</h1>
+
+					<?php
+						if ( is_category() || is_tag() || is_tax() ) {
+							$term_description = term_description();
+							if ( ! empty( $term_description ) )
+								echo apply_filters( "{$term->taxonomy}_archive_meta", "<div class='{$term->taxonomy}-archive-meta'>$term_description</div>" );
+						}
+					?>
 				</header>
 
 				<?php