Index: wp-content/themes/default/archive.php
===================================================================
--- wp-content/themes/default/archive.php	(revision 12320)
+++ wp-content/themes/default/archive.php	(working copy)
@@ -13,9 +13,9 @@
 
  	  <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
  	  <?php /* If this is a category archive */ if (is_category()) { ?>
-		<h2 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
+		<h2 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category <?php edit_category_link('Edit', ' | ', ''); ?></h2>
  	  <?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
-		<h2 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217;</h2>
+		<h2 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217; <?php edit_tag_link('Edit', ' | ', ''); ?></h2>
  	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
 		<h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
  	  <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 12320)
+++ wp-includes/link-template.php	(working copy)
@@ -609,6 +609,48 @@
 }
 
 /**
+ * Retrieve edit category link.
+ *
+ * @since 3.0.0
+ *
+ * @param int $category_id Category ID
+ * @return string
+ */
+function get_edit_category_link( $category_id = 0, $taxonomy = 'category' ) {
+	$category = get_term($category_id, $taxonomy);
+
+	if ( !current_user_can('manage_categories') )
+		return;
+
+	$location = admin_url('categories.php?action=edit&amp;amp;taxonomy=' . $taxonomy . '&amp;cat_ID=' . $category->term_id);
+	return apply_filters( 'get_edit_category_link', $location );
+}
+
+/**
+ * Display or retrieve edit category link with formatting.
+ *
+ * @since 3.0.0
+ *
+ * @param string $link Optional. Anchor text.
+ * @param string $before Optional. Display before edit link.
+ * @param string $after Optional. Display after edit link.
+ * @param int|object $category Tag object or ID
+ * @return string|null HTML content, if $echo is set to false.
+ */
+function edit_category_link( $link = '', $before = '', $after = '', $category = null ) {
+	$category = get_term($category, 'category');
+
+	if ( !current_user_can('manage_categories') )
+		return;
+
+	if ( empty($link) )
+		$link = __('Edit This');
+
+	$link = '<a href="' . get_edit_category_link( $category->term_id ) . '" title="' . __( 'Edit tag' ) . '">' . $link . '</a>';
+	echo $before . apply_filters( 'edit_category_link', $link, $category->term_id ) . $after;
+}
+
+/**
  * Retrieve the permalink for the feed of the search results.
  *
  * @since 2.5.0