diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index e96b6d01a9..2722aa2586 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -157,7 +157,7 @@ $posts_columns['control_delete'] = '';
 <?php
 if ($posts) {
 $bgcolor = '';
-foreach ($posts as $post) { start_wp();
+while (have_posts()) : the_post();
 add_filter('the_title','wp_specialchars');
 $class = ('alternate' == $class) ? '' : 'alternate';
 ?> 
@@ -235,7 +235,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 ?>
 	</tr> 
 <?php
-}
+endwhile;
 } else {
 ?>
   <tr style='background-color: <?php echo $bgcolor; ?>'> 
diff --git a/wp-atom.php b/wp-atom.php
index 2069bdf828..72d46f3566 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -23,7 +23,7 @@ $more = 1;
 	<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog'), 0); ?></copyright>
 	<generator url="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
 	<?php do_action('atom_head'); ?>
-	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
+	<?php while (have_posts()) : the_post(); ?>
 	<entry>
 	  	<author>
 			<name><?php the_author() ?></name>
@@ -41,5 +41,5 @@ $more = 1;
 <?php rss_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
 	</entry>
-	<?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
+	<?php endwhile ; ?>
 </feed>
diff --git a/wp-content/themes/classic/comments-popup.php b/wp-content/themes/classic/comments-popup.php
index b39c8c5128..ce103c65c8 100644
--- a/wp-content/themes/classic/comments-popup.php
+++ b/wp-content/themes/classic/comments-popup.php
@@ -1,7 +1,7 @@
 <?php 
 /* Don't remove these lines. */
 add_filter('comment_text', 'popuplinks');
-foreach ($posts as $post) { start_wp();
+while( have_posts()) : the_post();
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -93,7 +93,7 @@ if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH
 <div><strong><a href="javascript:window.close()"><?php _e("Close this window."); ?></a></strong></div>
 
 <?php // if you delete this the sky will fall on your head
-}
+endwhile;
 ?>
 
 <!-- // this is just the end of the motor - don't touch that line either :) -->
diff --git a/wp-content/themes/default/comments-popup.php b/wp-content/themes/default/comments-popup.php
index 42c9bc5eec..838be1a3d2 100644
--- a/wp-content/themes/default/comments-popup.php
+++ b/wp-content/themes/default/comments-popup.php
@@ -1,7 +1,7 @@
 <?php 
 /* Don't remove these lines. */
 add_filter('comment_text', 'popuplinks');
-foreach ($posts as $post) { start_wp();
+while ( have_posts()) : the_post();
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -93,7 +93,7 @@ if (!empty($post->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $pos
 <div><strong><a href="javascript:window.close()">Close this window.</a></strong></div>
 
 <?php // if you delete this the sky will fall on your head
-}
+endwhile;
 ?>
 
 <!-- // this is just the end of the motor - don't touch that line either :) -->
diff --git a/wp-rss.php b/wp-rss.php
index a342ee573b..c10b065f0e 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -21,7 +21,7 @@ $more = 1;
 	<language><?php echo get_option('rss_language'); ?></language>
 	<?php do_action('rss_head'); ?>
 
-<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
+<?php while (have_posts()) : the_post(); ?>
 	<item>
 		<title><?php the_title_rss() ?></title>
 <?php if (get_option('rss_use_excerpt')) { ?>
@@ -32,6 +32,6 @@ $more = 1;
 		<link><?php permalink_single_rss() ?></link>
 		<?php do_action('rss_item'); ?>
 	</item>
-<?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
+<?php endwhile; ?>
 </channel>
 </rss>
diff --git a/wp-rss2.php b/wp-rss2.php
index baec198079..bfad9a5afc 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -27,7 +27,7 @@ $more = 1;
 	<generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
 	<language><?php echo get_option('rss_language'); ?></language>
 	<?php do_action('rss2_head'); ?>
-	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
+	<?php while( have_posts()) : the_post(); ?>
 	<item>
 		<title><?php the_title_rss() ?></title>
 		<link><?php permalink_single_rss() ?></link>
@@ -51,6 +51,6 @@ $more = 1;
 <?php rss_enclosure(); ?>
 	<?php do_action('rss2_item'); ?>
 	</item>
-	<?php $items_count++; if (($items_count == get_option('posts_per_rss')) && !is_date()) { break; } } } ?>
+	<?php endwhile; ?>
 </channel>
 </rss>
