diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 0e8c78d0a..35f12fbad 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1237,11 +1237,11 @@ function generate_rewrite_rules($permalink_structure = '', $matches = '') {
 	'([0-9]{1,2})',
 	'([0-9]{1,2})',
 	'([0-9]{1,2})',
-	'([_0-9a-z-]+)',
+	'([^/]+)',
 	'([0-9]+)',
-	'([/_0-9a-z-]+)',
-	'([_0-9a-z-]+)',
-	'([_0-9a-z-]+)',
+	'(.+?)',
+	'([^/]+)',
+	'([^/]+)',
 	'(.+)'
 	);