diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
index f854465dd..62eb72f01 100644
--- a/wp-content/themes/default/archive.php
+++ b/wp-content/themes/default/archive.php
@@ -53,13 +53,20 @@ get_header();
 			<div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
 			<div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
 		</div>
+	<?php else :
 
-	<?php else : ?>
+		if (is_category()) // If this is a category archive
+			printf("<h2 class='center'>Sorry, but there aren't any posts in the %s category yet.</h2>", single_cat_title('',false));
+		else if (is_date()) // If this is a date archive
+			echo("<h2>Sorry, but there aren't any posts with this date.</h2>");
+		else if (is_author()) // If this is a category archive
+			printf("<h2 class='center'>Sorry, but there aren't any posts by %s yet.</h2>", get_userdatabylogin(get_query_var('author_name'))->display_name);
+		else
+			echo("<h2 class='center'>No posts found.</h2>");
+		include (TEMPLATEPATH . '/searchform.php');
 
-		<h2 class="center">Not Found</h2>
-		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
-
-	<?php endif; ?>
+	endif;
+?>
 
 	</div>