diff --git a/ChangeLog b/ChangeLog
index d1e2acf5..eb4d14f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	Convert #ifdef ENABLE_MULTIBUFFER to #ifndef DISABLE_MULTIBUFFER.
 	* src/{proto.h,files.c,,nano.c,winio.c}, configure.ac:
 	Convert #ifdef NANO_EXTRA to #ifndef DISABLE_EXTRA.
+	* src/{global.c,text.c}: Fix two compilation warnings for tiny.
 
 2014-04-02  Benno Schulenberg  <bensberg@justemail.net>
 	* configure.ac, doc/Makefile.am: Try to build the info documentation
diff --git a/src/global.c b/src/global.c
index 693ab5dd..85e5ea9c 100644
--- a/src/global.c
+++ b/src/global.c
@@ -577,7 +577,9 @@ void shortcut_init(bool unjustify)
 #endif
     const char *refresh_msg = N_("Refresh");
     const char *go_to_line_msg = N_("Go To Line");
+#ifndef DISABLE_SPELLER
     const char *spell_msg = N_("To Spell");
+#endif
 #ifdef ENABLE_COLOR
     const char *lint_msg = N_("To Linter");
     const char *prev_lint_msg = N_("Prev Lint Msg");
@@ -615,8 +617,10 @@ void shortcut_init(bool unjustify)
 	N_("Uncut from the cutbuffer into the current line");
     const char *nano_cursorpos_msg =
 	N_("Display the position of the cursor");
+#ifndef DISABLE_SPELLER
     const char *nano_spell_msg =
 	N_("Invoke the spell checker, if available");
+#endif
     const char *nano_replace_msg =
 	N_("Replace a string or a regular expression");
      const char *nano_gotoline_msg = N_("Go to line and column number");
diff --git a/src/text.c b/src/text.c
index f7623ef8..796df4c5 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3190,9 +3190,9 @@ void do_linter(void)
 	    tmpcol = curlint->colno;
 
 	if (tmplint != curlint) {
+#ifndef NANO_TINY
 	    struct stat lintfileinfo;
 
-#ifndef NANO_TINY
 	    new_lint_loop:
 	    if (stat(curlint->filename, &lintfileinfo) != -1) {
 		if (openfile->current_stat->st_ino != lintfileinfo.st_ino) {