diff --git a/ChangeLog b/ChangeLog
index 8f2fc2ef..4d2464e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	show the important toggles early on, and group them better.
 	* src/global.c (shortcut_init): Improve order and grouping in the
 	main help text and help lines.
+	* src/global.c (strtosc): Fix compilation with --enable-tiny.
 
 2014-04-27  Mark Majeres  <mark@engine12.com>
 	* src/rcfile.c (parse_include): Plug two tiny memory leaks.
diff --git a/src/global.c b/src/global.c
index 3667dd2c..fa300070 100644
--- a/src/global.c
+++ b/src/global.c
@@ -483,7 +483,9 @@ void shortcut_init(void)
     const char *gotoline_tag = N_("Go To Line");
     const char *prev_line_tag = N_("Prev Line");
     const char *next_line_tag = N_("Next Line");
+#ifndef DISABLE_JUSTIFY
     const char *fulljustify_tag = N_("FullJstify");
+#endif
     const char *refresh_tag = N_("Refresh");
 #ifndef DISABLE_SPELLER
     const char *spell_tag = N_("To Spell");
@@ -1278,22 +1280,26 @@ sc *strtosc(char *input)
 	s->scfunc = do_insertfile_void;
     else if (!strcasecmp(input, "whereis"))
 	s->scfunc = do_search;
+#ifndef NANO_TINY
     else if (!strcasecmp(input, "searchagain") ||
 	     !strcasecmp(input, "research"))
 	s->scfunc = do_research;
+#endif
     else if (!strcasecmp(input, "replace"))
 	s->scfunc = do_replace;
     else if (!strcasecmp(input, "cut"))
 	s->scfunc = do_cut_text_void;
-    else if (!strcasecmp(input, "copytext"))
-	s->scfunc = do_copy_text;
     else if (!strcasecmp(input, "uncut"))
 	s->scfunc = do_uncut_text;
+#ifndef NANO_TINY
+    else if (!strcasecmp(input, "copytext"))
+	s->scfunc = do_copy_text;
     else if (!strcasecmp(input, "mark"))
 	s->scfunc = do_mark;
     else if (!strcasecmp(input, "tospell") ||
 	     !strcasecmp(input, "speller"))
 	s->scfunc = do_spell;
+#endif
     else if (!strcasecmp(input, "curpos") ||
 	     !strcasecmp(input, "cursorpos"))
 	s->scfunc = do_cursorpos_void;