diff --git a/feed.xml b/feed.xml
index b6be53c..b880dc2 100644
--- a/feed.xml
+++ b/feed.xml
@@ -29,7 +29,7 @@ layout: none
     <uri>{{ site.url }}</uri>
     <email>{{ site.owner.email }}</email>
   </author>
-  {% for tag in post.tags %}<category scheme="{{ site.url }}/tags/#{{ tag | cgi_encode }}" term="{{ tag }}" />{% endfor %}
+  {% for tag in post.tags %}<category scheme="{{ site.url }}/tags/#{{ tag | uri_escape }}" term="{{ tag }}" />{% endfor %}
   <content type="html">{{ post.content | xml_escape }}
   &lt;p&gt;&lt;a href=&quot;{{ site.url }}{{ post.url }}&quot;&gt;{{ post.title }}&lt;/a&gt; was originally published by {{ site.owner.name }} at &lt;a href=&quot;{{ site.url }}&quot;&gt;{{ site.title }}&lt;/a&gt; on {{ post.date | date: "%B %d, %Y" }}.&lt;/p&gt;</content>
 </entry>