diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 0aa869652e..ac8a20f545 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1844,11 +1844,13 @@ function wp_trim_excerpt($text) {
 		$text = strip_tags($text);
 		$excerpt_length = apply_filters('excerpt_length', 55);
 		$excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
-		$words = explode(' ', $text, $excerpt_length + 1);
-		if (count($words) > $excerpt_length) {
+		$words = preg_split("/[\n\r\t ]+/", $text, $excerpt_length + 1, PREG_SPLIT_NO_EMPTY);
+		if ( count($words) > $excerpt_length ) {
 			array_pop($words);
 			$text = implode(' ', $words);
 			$text = $text . $excerpt_more;
+		} else {
+			$text = implode(' ', $words);
 		}
 	}
 	return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);