diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index f34c33efe5..6fa0887c26 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; ?>?([0-9a-z-]+)?/? <?php echo $site_root; ?>index.php?category_name=$1 [QSA]</textarea> 
+RewriteRule ^<?php echo $catmatch; ?>?(.*) <?php echo $site_root; ?>index.php?category_name=$1 [QSA]</textarea> 
 	</form>
 </div> 
 <?php
diff --git a/wp-blog-header.php b/wp-blog-header.php
index 60478c9a63..89872e8d51 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -166,7 +166,7 @@ if ((empty($cat)) || ($cat == 'all') || ($cat == '0')) {
 // Category stuff for nice URIs
 
 if ('' != $category_name) {
-	$category_name = preg_replace('|[^a-z0-9-/]|', '', $category_name);
+	$category_name = preg_replace('|[^a-z0-9-]|', '', $category_name);
 	$tables = ", $tablepost2cat, $tablecategories";
 	$join = " LEFT JOIN $tablepost2cat ON ($tableposts.ID = $tablepost2cat.post_id) LEFT JOIN $tablecategories ON ($tablepost2cat.category_id = $tablecategories.cat_ID) ";
 	$whichcat = " AND (category_nicename = '$category_name') ";