diff --git a/ChangeLog b/ChangeLog
index 744864019a..b307d0f9ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Mantis
 
+ * Fixed sorting in buglist is now preserved when going to next or prev page.
  * Fixed sorting in buglist. Bugs with high priority is now always first.
 
 07.29.2001  -   0.15.3
diff --git a/view_all_bug_page.php3 b/view_all_bug_page.php3
index b6c5983cdc..90f70b3abf 100644
--- a/view_all_bug_page.php3
+++ b/view_all_bug_page.php3
@@ -67,14 +67,15 @@
 	### same sort order
 	if ( isset( $f_dir ) ) {
 		if ( $f_dir=="ASC" ) {
-			$f_dir = "DESC";
+			$f_dir_new = "DESC";
 		}
 		else {
-			$f_dir = "ASC";
+			$f_dir_new = "ASC";
 		}
 	}
 	else {
-		$f_dir = "DESC";
+		$f_dir = "ASC";
+		$f_dir_new = "DESC";
 	}
 
 	### build our query string based on our viewing criteria
@@ -116,7 +117,7 @@
 	if ( !isset( $f_sort ) ) {
 			$f_sort="last_updated";
 	}
-	$query = $query." ORDER BY priority desc, '$f_sort' $f_dir";
+	$query = $query." ORDER BY priority desc, '$f_sort' $f_dir_new";
 	if ( isset( $f_limit_view ) ) {
 		$query = $query." LIMIT $f_offset, $f_limit_view";
 	}
diff --git a/view_all_inc.php b/view_all_inc.php
index 51b2a04250..b19260c8be 100644
--- a/view_all_inc.php
+++ b/view_all_inc.php
@@ -120,8 +120,8 @@
 			 
 		</td>
 		<td width="8%">
-			<? print_view_bug_sort_link( $link_page, $s_id, "id", $f_dir ) ?>
-			<? print_sort_icon( $f_dir, $f_sort, "id" ) ?>
+			<? print_view_bug_sort_link( $link_page, $s_id, "id", $f_dir_new ) ?>
+			<? print_sort_icon( $f_dir_new, $f_sort, "id" ) ?>
 		</td>
 		<td width="3%">
 			<b>
@@ -129,24 +129,24 @@
 			</b>
 		</td>
 		<td width="12%">
-			<? print_view_bug_sort_link( $link_page, $s_category, "category", $f_dir ) ?>
-			<? print_sort_icon( $f_dir, $f_sort, "category" ) ?>
+			<? print_view_bug_sort_link( $link_page, $s_category, "category", $f_dir_new ) ?>
+			<? print_sort_icon( $f_dir_new, $f_sort, "category" ) ?>
 		</td>
 		<td width="10%">
-			<? print_view_bug_sort_link( $link_page, $s_severity, "severity", $f_dir ) ?>
-			<? print_sort_icon( $f_dir, $f_sort, "severity" ) ?>
+			<? print_view_bug_sort_link( $link_page, $s_severity, "severity", $f_dir_new ) ?>
+			<? print_sort_icon( $f_dir_new, $f_sort, "severity" ) ?>
 		</td>
 		<td width="10%">
-			<? print_view_bug_sort_link( $link_page, $s_status, "status", $f_dir ) ?>
-			<? print_sort_icon( $f_dir, $f_sort, "status" ) ?>
+			<? print_view_bug_sort_link( $link_page, $s_status, "status", $f_dir_new ) ?>
+			<? print_sort_icon( $f_dir_new, $f_sort, "status" ) ?>
 		</td>
 		<td width="12%">
-			<? print_view_bug_sort_link( $link_page, $s_updated, "last_updated", $f_dir ) ?>
-			<? print_sort_icon( $f_dir, $f_sort, "last_updated" ) ?>
+			<? print_view_bug_sort_link( $link_page, $s_updated, "last_updated", $f_dir_new ) ?>
+			<? print_sort_icon( $f_dir_new, $f_sort, "last_updated" ) ?>
 		</td>
 		<td width="43%">
-			<? print_view_bug_sort_link( $link_page, $s_summary, "summary", $f_dir ) ?>
-			<? print_sort_icon( $f_dir, $f_sort, "summary" ) ?>
+			<? print_view_bug_sort_link( $link_page, $s_summary, "summary", $f_dir_new ) ?>
+			<? print_sort_icon( $f_dir_new, $f_sort, "summary" ) ?>
 		</td>
 	</tr>
 	<tr height="5">
@@ -259,10 +259,10 @@
 	}
 
 	if ( $f_offset_prev >= 0 ) {
-		print_bracket_link( $link_page."?f_offset=".$f_offset_prev, "View Prev ".$f_limit_view );
+		print_bracket_link( $link_page."?f_sort=".$f_sort."&f_dir=".$f_dir."&f_offset=".$f_offset_prev, "View Prev ".$f_limit_view );
 	}
 	if ( $row_count == $f_limit_view ) {
-		print_bracket_link( $link_page."?f_offset=".$f_offset_next, "View Next ".$f_limit_view );
+		print_bracket_link( $link_page."?f_sort=".$f_sort."&f_dir=".$f_dir."&f_offset=".$f_offset_next, "View Next ".$f_limit_view );
 	}
 ?>
 </div>
\ No newline at end of file