diff --git a/ChangeLog b/ChangeLog
index 056df949..97d4ba83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@ CVS code -
   shorcut_init()
 	- Replace hard coded ALT_G and ALT_H values in the replace
 	  and goto shortcuts with their macro counterparts NANO_ALT_*_KEY.	
+- search.c:
+  findnextstr()
+	- Fix off by one in check for wrap around (Rocco Corsi).
 - winio.c:
   edit_refresh()
 	- Rename lines to nlines to fix AIX breakage (reported by
diff --git a/search.c b/search.c
index 90962c25..7afe28e5 100644
--- a/search.c
+++ b/search.c
@@ -305,7 +305,7 @@ filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin, int beg
 	current_x_find = found - fileptr->data;
 #if 1
 	/* Ensure we haven't wrapped around again! */
-	if ((search_last_line) && (current_x_find >= beginx)) {
+	if ((search_last_line) && (current_x_find > beginx)) {
 	    if (!quiet)
 		not_found_msg(needle);
 	    return NULL;