diff --git a/ChangeLog b/ChangeLog
index 9b9827c0246e8d95af2bd9413a2676c30e3a2756..f3e8273e2708e3b81ffc9f7c5ab969264a459d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-13  Benno Schulenberg  <bensberg@justemail.net>
+	* src/search.c (do_replace_loop): Fix compilation with --enable-tiny.
+	* README: Mention also the Savannah page for reporting bugs.
+
 2015-04-12  Benno Schulenberg  <bensberg@justemail.net>
 	* src/browser.c (filesearch_init): Stop M-\ and M-/ in WhereisFile
 	menu (reached via ^R ^T ^W) from doing also an unrequested search
diff --git a/README b/README
index c0e7da6e44c9105f40521f1e3ecfa921001ad833..9fa2f03274ce16d041f6f88480c98e38e07a5837 100644
--- a/README
+++ b/README
@@ -60,7 +60,8 @@ Mailing Lists and Bug Reports
 	subscribe to.
 
 	For general bug reports, send a description of the problem to
-	nano@nano-editor.org or directly to the development list.
+	nano@nano-editor.org or to the development list, or file it on
+	the Savannah page (https://savannah.gnu.org/bugs/?group=nano).
 
 Current Status
 
diff --git a/src/search.c b/src/search.c
index 5c62cbd654b25708da739a9530c778d04370fbd3..f96d6a9b048981ffd11f9350b5c3ca7eab61a0d9 100644
--- a/src/search.c
+++ b/src/search.c
@@ -842,11 +842,11 @@ ssize_t do_replace_loop(
 		    if (*real_current_x < openfile->current_x + match_len)
 			*real_current_x = openfile->current_x + match_len;
 		    *real_current_x += length_change;
+#ifndef NANO_TINY
 		    bot_x = *real_current_x;
 		}
-#ifndef NANO_TINY
-	    }
 #endif
+	    }
 
 	    /* Set the cursor at the last character of the replacement
 	     * text, so searching will resume after the replacement