diff --git a/xsl/atom.xsl b/xsl/atom.xsl
index a974b93ca..8f6bbd0b0 100644
--- a/xsl/atom.xsl
+++ b/xsl/atom.xsl
@@ -63,7 +63,7 @@
       <author>
         <name><xsl:value-of select="@author"/></name>
       </author>
-      <content type="html">
+      <content type="xhtml">
         <!--div xmlns="http://www.w3.org/1999/xhtml"-->
           <xsl:apply-templates/>
         <!--/div-->
@@ -71,7 +71,7 @@
       <xsl:for-each select="resource">
         <link
           rel="enclosure"
-          href="{.}"
+          href="{translate(., ' ', '+')}"
           type="{@type}"
           length="{@size}"
           />
diff --git a/xsl/rss.xsl b/xsl/rss.xsl
index 32b9ad4a4..fd2ea4066 100644
--- a/xsl/rss.xsl
+++ b/xsl/rss.xsl
@@ -58,7 +58,7 @@
         -->
       <xsl:for-each select="resource">
         <enclosure
-          url="{.}"
+          url="{replace(., ' ', '+')}"
           length="{@size}"
           type="{@type}"
           />
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index 4abf43c59..fcb78648b 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -251,7 +251,7 @@
           <ul>
             <xsl:for-each select="resource">
               <li>
-                <a href="{.}" type="{@type}">
+                <a href="{replace(., ' ', '+'}" type="{@type}">
                   <xsl:choose>
                     <xsl:when test="@title"><xsl:value-of select="@title"/></xsl:when>
                     <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -267,7 +267,7 @@
           <ul>
             <xsl:for-each select="resource[not(@hide='yes')]">
               <li>
-                <a href="{.}" type="{@type}">
+                <a href="{replace(., ' ', '+')}" type="{@type}">
                   <xsl:choose>
                     <xsl:when test="@title"><xsl:value-of select="@title"/></xsl:when>
                     <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>