diff -u -r pixelpost_1.4.2/includes/functions.php pixelpost_1.4.2.mine/includes/functions.php
--- pixelpost_1.4.2/includes/functions.php	2005-06-08 13:27:00.000000000 +0200
+++ pixelpost_1.4.2.mine/includes/functions.php	2005-08-01 10:41:25.697625000 +0200
@@ -8,8 +8,8 @@
 
 	$comment_count = 0;
 	$image_comments = "<ul>"; // comments stored in this string
-	$cquery = mysql_query("select datetime, message, name, url, email  from ".$pixelpost_db_prefix."comments where parent_id='".$imageid."' order by id asc");
-	while(list($comment_datetime, $comment_message, $comment_name, $comment_url, $comment_email) = mysql_fetch_row($cquery)) {
+	$cquery = mysql_query("select id, datetime, message, name, url, email  from ".$pixelpost_db_prefix."comments where parent_id='".$imageid."' order by id asc");
+	while(list($id, $comment_datetime, $comment_message, $comment_name, $comment_url, $comment_email) = mysql_fetch_row($cquery)) {
 		$comment_message = pullout($comment_message);
 		$comment_name = pullout($comment_name);
 		// addyd by Ramin for email field in comments
@@ -21,7 +21,7 @@
 			}
 		$comment_datetime = strtotime($comment_datetime);
 		$comment_datetime = date($cfgrow['dateformat'],$comment_datetime);
-		$image_comments .= "<li>$comment_message<br />$comment_name @ $comment_datetime</li>";
+		$image_comments .= "<li id=\"c$id\">$comment_message<br />$comment_name @ $comment_datetime</li>";
 		$comment_count++;
 		}
 	if($comment_count == 0) { $image_comments .= "<li>$lang_no_comments_yet</li>"; }
diff -u -r pixelpost_1.4.2/index.php pixelpost_1.4.2.mine/index.php
--- pixelpost_1.4.2/index.php	2005-07-16 20:53:00.000000000 +0200
+++ pixelpost_1.4.2.mine/index.php	2005-08-01 10:40:47.853875000 +0200
@@ -576,6 +576,65 @@
     }
 
 // ##########################################################################################//
+// RSS 2.0 FEED for comments
+// ##########################################################################################//
+if($_GET['x'] == "rsscomment") {
+   pullout($cfgrow['sitetitle']);
+    $output = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+    <rss version=\"2.0\">
+    <channel>
+    <title>".$cfgrow['sitetitle']." - Comments</title>
+    <link>".$cfgrow['siteurl']."</link>
+    <description>".$cfgrow['sitetitle']." photoblog - Comments</description>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <generator>pixelpost</generator>
+    ";
+   $tzoner = $cfgrow['timezone'];
+   $tprefix = '+';
+   $tzoner = sprintf ("%01.2f", $tzoner);
+   if (substr($tzoner,0,1)=='-') {
+      $tzoner = (substr($tzoner,1));
+      $tprefix = '-';
+      }
+   if ($tzoner < 10){$tzoner = "0".$tzoner;}
+   $hh = substr($tzoner,0,2);
+   $mm = substr($tzoner,-2);
+   $tzoner = $tprefix.$hh.$mm;
+   $query = mysql_query("select c.id,c.parent_id,c.datetime,c.message,c.name,p.headline from ".$pixelpost_db_prefix."comments c, ".$pixelpost_db_prefix."pixelpost p where c.parent_id = p.id and (c.datetime<='$cdate') order by c.datetime desc limit 10");
+   while(list($id,$parent_id,$datetime,$message,$name,$headline) = mysql_fetch_row($query)) {
+        $headline = pullout($headline);
+        $message = pullout($message);
+        $name = pullout($name);
+
+        $datetime = strtotime($datetime);
+        $datetime =  date("D, d M Y H:i",$datetime);
+        $datetime .= ' ' .$tzoner;
+        $message = stripslashes($message);
+        $message = str_replace("\n","&lt;br /&gt;",$message);
+        // added to remove HTML tags
+        $message = strip_tags( $message );
+        $name = stripslashes($name);
+        $name = str_replace("\n","&lt;br /&gt;",$name);
+        // added to remove HTML tags
+        $name = strip_tags( $name );
+        $output .= "
+        <item>
+        <title>$headline - comment by $name</title>
+        <link>".$cfgrow['siteurl']."?popup=comment&amp;showimage=$parent_id#c$id</link>
+        <description>$message</description>
+        <pubDate>$datetime</pubDate>
+        </item>
+        ";
+        }
+    $output .= "
+        </channel>
+        </rss>";
+    header("Content-type:application/xml");
+    echo $output;
+    exit;
+    }
+
+// ##########################################################################################//
 // ATOM FEED - re and triple check the encoding please please please
 // ##########################################################################################//
 $atom_url = "http://".$HTTP_HOST.$REQUEST_URI."&amp;x=atom";
@@ -637,9 +696,80 @@
     exit;
     }
 
+// ##########################################################################################//
+// ATOM FEED comments - re and triple check the encoding please please please
+// ##########################################################################################//
+$atom_comment_url = "http://".$HTTP_HOST.$REQUEST_URI."&amp;x=atomcomment";
+$tpl = str_replace("<ATOM_COMMENT_AUTODETECT>",$atom_comment_url,$tpl);
+if($_GET['x'] == "atomcomment") {
+    header("content-type: application/atom+xml");
+   $tzoner = $cfgrow['timezone'];
+   $tprefix = '+';
+   $tzoner = sprintf ("%01.2f", $tzoner);
+   if (substr($tzoner,0,1)=='-') {
+      $tzoner = (substr($tzoner,1));
+      $tprefix = '-';
+      }
+   if ($tzoner < 10){$tzoner = "0".$tzoner;}
+   $hh = substr($tzoner,0,2);
+   $mm = substr($tzoner,-2);
+   $tzoner = $tprefix.$hh.":".$mm;
+   pullout($cfgrow['sitetitle']);
+   pullout($cfgrow['headline']);
+   $url = $cfgrow['siteurl'];
+    $atom = "<?xml version='1.0' encoding='utf-8'?>
+    <feed version='0.3' xml:lang='en' xmlns='http://purl.org/atom/ns#'>
+    <title>".$cfgrow['sitetitle']." - Comments</title>
+    <link rel='alternate' type='text/html' href='".$cfgrow['siteurl']."' title='".$cfgrow['sitetitle']." - Comments' />
+    <author>
+    <name>".$cfgrow['sitetitle']."</name>
+    <url>$url</url>
+    </author>
+    <generator url='http://www.pixelpost.org/' version='1.4.1'>Pixelpost</generator>
+    <modified>".date("Y-m-d\TH:i:s$tzoner")."</modified>
+    ";
+     $tag_url = $_SERVER['HTTP_HOST'];
+     $query = mysql_query("select c.id,c.parent_id,c.datetime,c.message,c.name,p.headline from ".$pixelpost_db_prefix."comments c, ".$pixelpost_db_prefix."pixelpost p where c.parent_id = p.id and (c.datetime<='$cdate') order by c.datetime desc limit 10");
+     while(list($id,$parent_id,$datetime,$message,$name,$headline) = mysql_fetch_row($query)) {
+        $headline = pullout($headline);
+        $message = pullout($message);
+        $name = pullout($name);
+        $message = strip_tags( $message );
+        $name = strip_tags( $name );
+
+        $tag_date =  substr($datetime,0,10);
+        $modified_date =  substr($datetime,0,10);
+        $modified_date = $modified_date."T".(substr($datetime,11,8));
+        $datetime = strtotime($datetime);
+        $atom .= "<entry>
+        <title type='text/html' mode='escaped'>$headline - comment by $name</title>
+        <link rel='alternate' type='text/html' href='".$cfgrow['siteurl']."?popup=comment&amp;showimage=$parent_id#c$id' title='$headline' />
+        <id>tag:$tag_url,$tag_date:$id</id>
+        <content type='text/xhtml' mode='escaped'>
+	<![CDATA[
+        $message]]>
+        </content>
+        <issued>$tag_date</issued>
+        <modified>$modified_date$tzoner</modified>
+        </entry>
+        ";
+        }
+    $atom .= "</feed>";
+    echo $atom;
+    exit;
+    }
 
 $tpl = str_replace("<SITE_ATOM_LINK>","<a href='index.php?x=atom'>ATOM feed</a>",$tpl);
+$tpl = str_replace("<SITE_ATOM_COMMENT_LINK>","<a href='index.php?x=atomcomment'>Comments ATOM feed</a>",$tpl);
 $tpl = str_replace("<SITE_RSS_LINK>","<a href='index.php?x=rss'>RSS 2.0</a>",$tpl);
+$tpl = str_replace("<SITE_RSS_COMMENT_LINK>","<a href='index.php?x=rsscomment'>Comments RSS 2.0</a>",$tpl);
 
 // deactivated because of Referer-Spam
 // $tpl = str_replace("<SITE_REFLINK>","index.php?x=ref",$tpl);