diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index a67fc12a6..812475486 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -308,8 +308,13 @@ if ( $page_links )
 <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
 <p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
 </div>
-<?php endif; ?>
-
+<?php elseif ( 'post_tag' == $taxonomy ) : ?>
+<div class="form-wrap">
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'admin.php?import=wp-cat2tag&amp;step=3') ;?>.</p> 
+</div>
+<?php endif;
+do_action('after-' . $taxonomy . '-table', $taxonomy);
+?>
 
 </div>
 </div><!-- /col-right -->
diff --git a/wp-admin/tools.php b/wp-admin/tools.php
index e7145f339..80c0c1528 100644
--- a/wp-admin/tools.php
+++ b/wp-admin/tools.php
@@ -89,6 +89,17 @@ if ( ! $is_opera ) {
 <?php
 endif;
 
+$cats = get_taxonomy('category');
+$tags = get_taxonomy('post_tag');
+
+if ( current_user_can($cats->manage_cap) || current_user_can($tags->manage_cap) ) : ?> 
+<div class="tool-box"> 
+    <h3 class="title"><?php _e('Category&#47;Tag Conversion') ?></h3>
+    <p><?php printf(__('Use this to convert <a href="%s">categories to tags</a>, or <a href="%s">tags to categories</a>.'), 'admin.php?import=wp-cat2tag', 'admin.php?import=wp-cat2tag&amp;step=3'); ?></p> 
+</div> 
+<?php
+endif; 
+
 do_action( 'tool_box' );
 ?>
 </div>