diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index deabdbaa27c..f88ac078953 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-07  Ryan Yeske  <rcyeske@gmail.com>
+
+	* net/rcirc.el (rcirc-print): Fix last change.
+
 2006-09-12  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc.el (calc-dispatch): Remove unnecessary `sit-for'.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 12c86b8163f..a639afeecf8 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1260,11 +1260,10 @@ record activity."
 			      (with-current-buffer (window-buffer w)
 				(when (eq major-mode 'rcirc-mode)
 				  (with-selected-window w
-				    (when (<= (- (window-height) 
-						 (- (line-number-at-pos
-						     (window-point))
-						    (line-number-at-pos
-						     (window-start)))
+ 				    (when (<= (- (window-height)
+ 						 (count-screen-lines
+						  (window-point)
+						  (window-start))
 						 1)
 					      0)
 				      (recenter -1)))))))