diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 20e737dbad..c447dc9f17 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -151,7 +151,7 @@ $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
   <textarea rows="5" style="width: 100%;">RewriteEngine On
 RewriteBase <?php echo $site_root; ?> 
 RewriteRule ^<?php echo $match; echo '$ ' . $site_root . $query ?> [QSA]
-RewriteRule ^<?php echo $catmatch; ?>(.*) <?php echo $site_root; ?>index.php?category_name=$1 [QSA]</textarea> 
+RewriteRule ^<?php echo $catmatch; ?>?([0-9a-z-]+)?/? <?php echo $site_root; ?>index.php?category_name=$1 [QSA]</textarea> 
 	</form>
 </div> 
 <?php
diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php
index 63eca98ae0..46164f6ca5 100644
--- a/wp-includes/template-functions.php
+++ b/wp-includes/template-functions.php
@@ -1358,7 +1358,7 @@ function get_category_link($echo = false, $category_id, $category_nicename) {
 		if ('' == $category_nicename) $category_nicename = $wpdb->get_var("SELECT category_nicename FROM $tablecategories WHERE cat_ID = $category_id");
 		// Get any static stuff from the front
 		$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
-		$link = $siteurl . $front . 'category/' . $category_nicename;
+		$link = $siteurl . $front . 'category/' . $category_nicename . '/';
 	}
 
 	if ($echo) echo $link;