diff -Nur dotclear-2.1.5/inc/public/default-templates/atom.xml dotclear/inc/public/default-templates/atom.xml
--- dotclear-2.1.5/inc/public/default-templates/atom.xml	2009-02-28 14:48:15.000000000 +0100
+++ dotclear/inc/public/default-templates/atom.xml	2009-02-28 15:23:08.000000000 +0100
@@ -30,8 +30,14 @@
     </tpl:EntryIf>
     <tpl:EntryMetaData><dc:subject>{{tpl:MetaID}}</dc:subject></tpl:EntryMetaData>
     
-    <content type="html">{{tpl:EntryExcerpt absolute_urls="1" encode_xml="1"}}
-    {{tpl:EntryContent absolute_urls="1" encode_xml="1"}}</content>
+    <content type="html">
+    <tpl:EntryIf extended="1">
+        {{tpl:EntryExcerpt absolute_urls="1" encode_xml="1"}}
+    </tpl:EntryIf>
+    <tpl:EntryIf extended="0">
+        {{tpl:EntryContent absolute_urls="1" encode_xml="1"}}
+    </tpl:EntryIf>
+    </content>
     
     <tpl:Attachments>
       <link rel="enclosure" href="{{tpl:AttachmentURL}}"
@@ -46,4 +52,4 @@
   </entry>
   </tpl:Entries>
 
-</feed>
\ No newline at end of file
+</feed>
diff -Nur dotclear-2.1.5/inc/public/default-templates/rss2.xml dotclear/inc/public/default-templates/rss2.xml
--- dotclear-2.1.5/inc/public/default-templates/rss2.xml	2009-02-28 14:48:15.000000000 +0100
+++ dotclear/inc/public/default-templates/rss2.xml	2009-02-28 15:22:18.000000000 +0100
@@ -29,8 +29,14 @@
     </tpl:EntryIf>
     <tpl:EntryMetaData><category>{{tpl:MetaID}}</category></tpl:EntryMetaData>
     
-    <description>{{tpl:EntryExcerpt absolute_urls="1" encode_xml="1"}}
-    {{tpl:EntryContent absolute_urls="1" encode_xml="1"}}</description>
+    <description>
+    <tpl:EntryIf extended="1">
+        {{tpl:EntryExcerpt absolute_urls="1" encode_xml="1"}}
+    </tpl:EntryIf>
+    <tpl:EntryIf extended="0">
+        {{tpl:EntryContent absolute_urls="1" encode_xml="1"}}
+    </tpl:EntryIf>
+    </description>
     
     <tpl:Attachments>
       <enclosure url="{{tpl:AttachmentURL}}"
@@ -46,4 +52,4 @@
   </tpl:Entries>
   
 </channel>
-</rss>
\ No newline at end of file
+</rss>