diff --git a/wp-rss.php b/wp-rss.php
index 48eea39a7..adc689d1a 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -8,20 +8,6 @@ if (! $feed) {
 
 header('Content-type: text/xml', true);
 
-/* This doesn't take into account edits
-// Get the time of the most recent article
-$maxdate = $wpdb->get_var("SELECT max(post_date) FROM $tableposts");
-$unixtime = strtotime($maxdate);
-
-// format timestamp for Last-Modified header
-$clast = gmdate("D, d M Y H:i:s \G\M\T", $unixtime);
-$cetag = (isset($clast)) ? md5($clast) : '';
-
-// send it in a Last-Modified header
-header("Last-Modified: " . $clast, true);
-header("Etag: " . $cetag, true);
-*/
-
 ?>
 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
@@ -30,7 +16,7 @@ header("Etag: " . $cetag, true);
         <title><?php bloginfo_rss("name") ?></title>
         <link><?php bloginfo_rss("url") ?></link>
         <description><?php bloginfo_rss("description") ?></description>
-        <lastBuildDate><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</lastBuildDate>
+        <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT')); ?></lastBuildDate>
         <docs>http://backend.userland.com/rss092</docs>
         <managingEditor><?php echo antispambot(get_settings('admin_email')) ?></managingEditor>
         <webMaster><?php echo antispambot($admin_email) ?></webMaster>