diff --git a/package.json b/package.json
index d9338498..4528921d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "seriously-simple-podcasting",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "main": "build/index.js",
   "author": "CastosHQ",
   "devDependencies": {
diff --git a/readme.txt b/readme.txt
index 64634071..d93c59a7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: podcast, audio, video, vodcast, rss, mp3, mp4, feed, itunes, podcasting, m
 Requires at least: 4.4
 Tested up to: 5.7
 Requires PHP: 5.6
-Stable tag: 2.6.4
+Stable tag: 2.6.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -159,6 +159,11 @@ You can find complete user and developer documentation (along with the FAQs) on
 
 == Changelog ==
 
+= 2.6.5 =
+* 2021-05-07
+* UPDATE SUMMARY: Fix the feed error for the case if the author name has punctuation.
+* [FIX] Fixed the feed error for the case if the author name has punctuation.
+
 = 2.6.4 =
 * 2021-05-04
 * UPDATE SUMMARY: HTML player improvements and fixes, feed images fixes
diff --git a/seriously-simple-podcasting.php b/seriously-simple-podcasting.php
index 4802e8d6..3e426c24 100644
--- a/seriously-simple-podcasting.php
+++ b/seriously-simple-podcasting.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Plugin Name: Seriously Simple Podcasting
- * Version: 2.6.4
+ * Version: 2.6.5
  * Plugin URI: https://castos.com/seriously-simple-podcasting/?utm_medium=sspodcasting&utm_source=wordpress&utm_campaign=wpplugin_08_2019
  * Description: Podcasting the way it's meant to be. No mess, no fuss - just you and your content taking over the world.
  * Author: Castos
@@ -33,7 +33,7 @@
 use SeriouslySimplePodcasting\Controllers\Players_Controller;
 use SeriouslySimplePodcasting\Integrations\Elementor\Elementor_Widgets;
 
-define( 'SSP_VERSION', '2.6.4' );
+define( 'SSP_VERSION', '2.6.5' );
 define( 'SSP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'SSP_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
 
diff --git a/templates/feed-podcast.php b/templates/feed-podcast.php
index 1fcb3009..d9a805f4 100644
--- a/templates/feed-podcast.php
+++ b/templates/feed-podcast.php
@@ -64,7 +64,7 @@
 		<language><?php echo esc_html( $language ); ?></language>
 		<copyright><?php echo esc_html( $copyright ); ?></copyright>
 		<itunes:subtitle><?php echo esc_html( $subtitle ); ?></itunes:subtitle>
-		<itunes:author><?php echo esc_html( $author ); ?></itunes:author>
+		<itunes:author><![CDATA[<?php echo esc_html( $author ); ?>]]></itunes:author>
 		<?php
 		if ( $itunes_type ) {
 			?>
@@ -114,7 +114,7 @@
 			<itunes:new-feed-url><?php echo esc_url( $new_feed_url ); ?></itunes:new-feed-url>
 		<?php } ?>
 		<?php if ( 'off' === $turbo ) { ?>
-			<googleplay:author><?php echo esc_html( $author ); ?></googleplay:author>
+			<googleplay:author><![CDATA[<?php echo esc_html( $author ); ?>]]></googleplay:author>
 			<googleplay:email><?php echo esc_html( $owner_email ); ?></googleplay:email>
 			<googleplay:description><?php echo esc_html( $podcast_description ); ?></googleplay:description>
 			<googleplay:explicit><?php echo esc_html( $googleplay_explicit ); ?></googleplay:explicit>
diff --git a/templates/feed/feed-item.php b/templates/feed/feed-item.php
index 54177f98..4714e563 100644
--- a/templates/feed/feed-item.php
+++ b/templates/feed/feed-item.php
@@ -211,7 +211,7 @@
 	<title><?php echo $title; ?></title>
 	<link><?php the_permalink_rss(); ?></link>
 	<pubDate><?php echo $pub_date; ?></pubDate>
-	<dc:creator><?php echo $author; ?></dc:creator>
+	<dc:creator><![CDATA[<?php echo $author; ?>]]></dc:creator>
 	<guid isPermaLink="false"><?php the_guid(); ?></guid>
 	<description><![CDATA[<?php echo $description; ?>]]></description>
 	<itunes:subtitle><![CDATA[<?php echo $itunes_subtitle; ?>]]></itunes:subtitle>
@@ -248,7 +248,7 @@
 	<itunes:explicit><?php echo esc_html( $itunes_explicit_flag ); ?></itunes:explicit>
 	<itunes:block><?php echo esc_html( $block_flag ); ?></itunes:block>
 	<itunes:duration><?php echo esc_html( $duration ); ?></itunes:duration>
-	<itunes:author><?php echo $author; ?></itunes:author>
+	<itunes:author><![CDATA[<?php echo esc_html( $author ); ?>]]></itunes:author>
 	<?php if ( 'off' === $turbo ) { ?>
 		<googleplay:description><![CDATA[<?php echo $gp_description; ?>]]></googleplay:description>
 		<?php if ( $episode_image ) { ?>