diff --git a/wp-admin/import/rss.php b/wp-admin/import/rss.php
index c43367df7f..f2067c7c92 100644
--- a/wp-admin/import/rss.php
+++ b/wp-admin/import/rss.php
@@ -1,7 +1,11 @@
 <?php
+
+// Example:
+// define('RSSFILE', '/home/example/public_html/rss.xml');
+define('RSSFILE', 'rss.xml');
+
 class RSS_Import {
 
-	var $authors = array ();
 	var $posts = array ();
 
 	function header() {
@@ -13,6 +17,12 @@ class RSS_Import {
 		echo '</div>';
 	}
 
+	function unhtmlentities($string) { // From php.net for < 4.3 compat
+		$trans_tbl = get_html_translation_table(HTML_ENTITIES);
+		$trans_tbl = array_flip($trans_tbl);
+		return strtr($string, $trans_tbl);
+	}
+	
 	function greet() {
 		$this->header();
 ?>
@@ -24,156 +34,136 @@ class RSS_Import {
 <?php if ('' != RSSFILE) : ?>
 <a href="admin.php?import=rss&amp;step=1">Begin RSS Import &raquo;</a>
 <?php
-
 		endif;
 		$this->footer();
 	}
 
 	function get_posts() {
+		global $wpdb;
+		
 		set_magic_quotes_runtime(0);
 		$datalines = file(RSSFILE); // Read the file into an array
 		$importdata = implode('', $datalines); // squish it
 		$importdata = str_replace(array ("\r\n", "\r"), "\n", $importdata);
 
-		preg_match_all('|<item>(.*?)</item>|is', $importdata, $posts);
-		$this->posts = $posts[1];
+		preg_match_all('|<item>(.*?)</item>|is', $importdata, $this->posts);
+		$this->posts = $this->posts[1];
+		$index = 0;
+		foreach ($this->posts as $post) {
+			preg_match('|<title>(.*?)</title>|is', $post, $post_title);
+			$post_title = $wpdb->escape(trim($post_title[1]));
+
+			preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date);
+
+			if ($post_date) {
+				$post_date = strtotime($post_date[1]);
+			} else {
+				// if we don't already have something from pubDate
+				preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date);
+				$post_date = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date[1]);
+				$post_date = str_replace('T', ' ', $post_date);
+				$post_date = strtotime($post_date);
+			}
+
+			$post_date = gmdate('Y-m-d H:i:s', $post_date);
+
+			preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
+			$categories = $categories[1];
+
+			if (!$categories) {
+				preg_match_all('|<dc:subject>(.*?)</dc:subject>|is', $post, $categories);
+				$categories = $categories[1];
+			}
+
+			$cat_index = 0;
+			foreach ($categories as $category) {
+				$categories[$cat_index] = $wpdb->escape($this->unhtmlentities($category));
+				$cat_index++;
+			}
+
+			preg_match('|<guid.+?>(.*?)</guid>|is', $post, $guid);
+			if ($guid)
+				$guid = $wpdb->escape(trim($guid[1]));
+			else
+				$guid = '';
+
+			preg_match('|<content:encoded>(.*?)</content:encoded>|is', $post, $post_content);
+			$post_content = str_replace(array ('<![CDATA[', ']]>'), '', $wpdb->escape(trim($post_content[1])));
+
+			if (!$post_content) {
+				// This is for feeds that put content in description
+				preg_match('|<description>(.*?)</description>|is', $post, $post_content);
+				$post_content = $wpdb->escape($this->unhtmlentities(trim($post_content[1])));
+			}
+
+			// Clean up content
+			$post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+			$post_content = str_replace('<br>', '<br />', $post_content);
+			$post_content = str_replace('<hr>', '<hr />', $post_content);
+
+			$post_author = 1;
+			$post_status = 'publish';
+			$post_date_gmt = $post_date; // FIXME
+			$this->posts[$index] = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
+			$index++;
+		}
 	}
 
 	function import_posts() {
 		echo '<ol>';
-		foreach ($this->posts as $post)
-			: $title = $date = $categories = $content = $post_id = '';
-		echo "<li>Importing post... ";
 
-		preg_match('|<title>(.*?)</title>|is', $post, $title);
-		$title = $wpdb->escape(trim($title[1]));
-		$post_name = sanitize_title($title);
+		foreach ($this->posts as $post) {
+			echo "<li>".__('Importing post...');
 
-		preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $date);
+			extract($post);
 
-		if ($date)
-			: $date = strtotime($date[1]);
-		else
-			: // if we don't already have something from pubDate
-			preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $date);
-		$date = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $date[1]);
-		$date = str_replace('T', ' ', $date);
-		$date = strtotime($date);
-		endif;
-
-		$post_date = gmdate('Y-m-d H:i:s', $date);
-
-		preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
-		$categories = $categories[1];
-
-		if (!$categories)
-			: preg_match_all('|<dc:subject>(.*?)</dc:subject>|is', $post, $categories);
-		$categories = $categories[1];
-		endif;
-
-		preg_match('|<guid.+?>(.*?)</guid>|is', $post, $guid);
-		if ($guid)
-			$guid = $wpdb->escape(trim($guid[1]));
-		else
-			$guid = '';
-
-		preg_match('|<content:encoded>(.*?)</content:encoded>|is', $post, $content);
-		$content = str_replace(array ('<![CDATA[', ']]>'), '', $wpdb->escape(trim($content[1])));
-
-		if (!$content)
-			: // This is for feeds that put content in description
-			preg_match('|<description>(.*?)</description>|is', $post, $content);
-		$content = $wpdb->escape(unhtmlentities(trim($content[1])));
-		endif;
-
-		// Clean up content
-		$content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $content);
-		$content = str_replace('<br>', '<br />', $content);
-		$content = str_replace('<hr>', '<hr />', $content);
-
-		// This can mess up on posts with no titles, but checking content is much slower
-		// So we do it as a last resort
-		if ('' == $title)
-			: $dupe = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' AND post_date = '$post_date'");
-		else
-			: $dupe = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'");
-		endif;
-
-		// Now lets put it in the DB
-		if ($dupe)
-			: echo 'Post already imported';
-		else
-			: $wpdb->query("INSERT INTO $wpdb->posts 
-					(post_author, post_date, post_date_gmt, post_content, post_title,post_status, comment_status, ping_status, post_name, guid)
-					VALUES 
-					('$post_author', '$post_date', DATE_ADD('$post_date', INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE), '$content', '$title', 'publish', '$comment_status', '$ping_status', '$post_name', '$guid')");
-		$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'");
-		if (!$post_id)
-			die("couldn't get post ID");
-		if (0 != count($categories))
-			: foreach ($categories as $post_category)
-				: $post_category = unhtmlentities($post_category);
-		// See if the category exists yet
-		$cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
-		if (!$cat_id && '' != trim($post_category)) {
-			$cat_nicename = sanitize_title($post_category);
-			$wpdb->query("INSERT INTO $wpdb->categories (cat_name, category_nicename) VALUES ('$post_category', '$cat_nicename')");
-			$cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
+			if ($post_id = post_exists($post_title, $post_content, $post_date)) {
+				echo __('Post already imported');
+			} else {
+				$post_id = wp_insert_post($post);
+				if (!$post_id)
+					die(__("Couldn't get post ID"));
+	
+				if (0 != count($categories))
+					wp_create_categories($categories, $post_id);
+				echo __('Done !');
+			}
+			echo '</li>';
 		}
-		if ('' == trim($post_category))
-			$cat_id = 1;
-		// Double check it's not there already
-		$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = $cat_id");
 
-		if (!$exists) {
-			$wpdb->query("
-						INSERT INTO $wpdb->post2cat
-						(post_id, category_id)
-						VALUES
-						($post_id, $cat_id)
-						");
-		}
-		endforeach;
-		else
-			: $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = 1");
-		if (!$exists)
-			$wpdb->query("INSERT INTO $wpdb->post2cat (post_id, category_id) VALUES ($post_id, 1) ");
-		endif;
-		echo 'Done!</li>';
-		endif;
-
-		endforeach;
 		echo '</ol>';
 
 	}
-	
-	
+
 	function import() {
-		// FIXME:  Don't die.
-		if ('' != RSSFILE && !file_exists(RSSFILE)) die("The file you specified does not seem to exist. Please check the path you've given.");
-		if ('' == RSSFILE) die("You must edit the RSSFILE line as described on the <a href='import-mt.php'>previous page</a> to continue.");
-	
+		// FIXME:  Don't die
+		if ('' == RSSFILE)
+			die("You must edit the RSSFILE line as described on the <a href='import-mt.php'>previous page</a> to continue.");
+
+		if (!file_exists(RSSFILE))
+			die("The file you specified does not seem to exist. Please check the path you've given.");
+
 		$this->get_posts();
 		$this->import_posts();
-		echo '<h3>All done. <a href="../">Have fun!</a></h3>';
+		echo '<h3>All done. <a href="' . get_option('home') . '">Have fun!</a></h3>';
 	}
-	
+
 	function dispatch() {
-		if (empty($_GET['step']))
+		if (empty ($_GET['step']))
 			$step = 0;
 		else
 			$step = (int) $_GET['step'];
-		
+
 		switch ($step) {
-			case 0:
+			case 0 :
 				$this->greet();
 				break;
-			case 1:
+			case 1 :
 				$this->import();
 				break;
 		}
 	}
-	
+
 	function RSS_Import() {
 		// Nothing.	
 	}
@@ -181,6 +171,5 @@ class RSS_Import {
 
 $rss_import = new RSS_Import();
 
-register_importer('rss', 'RSS', 'Import posts from and RSS feed', array($rss_import, 'dispatch'));
-
+register_importer('rss', 'RSS', 'Import posts from and RSS feed', array ($rss_import, 'dispatch'));
 ?>
\ No newline at end of file