diff --git a/ChangeLog b/ChangeLog
index ede5427b..2c86c0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@ CVS code -
 	- Mac file writing supported too.  Flag -M, --mac.  Toggle 
 	  Meta-O (MacOS? OS-X? =-)
 	- New smooth scroll code by Ken Tyler.  New flag -S, --smooth,
-	  changes to page_up() and page_down(). Fixes to paging by
+	  changes to page_up() and page_down().  Many fixes to paging by
 	  David Lawrence Ramsey.
 	- Bracket (brace, parens, etc) matching code by Ken Tyler.  
 	  New functions do_find_bracket(), changes to findnextstr(),
diff --git a/move.c b/move.c
index 17d9684f..75c40995 100644
--- a/move.c
+++ b/move.c
@@ -143,7 +143,15 @@ void page_up(void)
     if (edittop != fileage) {
 	if (!ISSET(SMOOTHSCROLL)) {
 	    edit_update(edittop, CENTER);
-	    center_cursor();
+	    /* Now that we've updated the edit window, edittop might be
+	       at the top of the file; if so, just move the cursor up one
+	       line and don't center it. */
+	    if (edittop != fileage)
+		center_cursor();
+	    else {
+		current = current->prev;
+		reset_cursor();
+	    }
 	} else {
 	    edit_update(edittop->prev, NONE);
 	}