diff --git a/ChangeLog b/ChangeLog
index f3bfd3ea29ea31515a4dd983dc697298178a126c..f2b269765f8728e6d0fff4fdb1a5ed6e5ae3d37b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-17  Benno Schulenberg  <bensberg@justemail.net>
+	* src/rcfile.c: Allow a tiny nano's ~/.nanorc to enable search and
+	position histories.  Also sort the options more strictly.
+
 2015-06-17  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_undo, add_undo): When undoing a Backspace at the tail
 	of the file and nonewlines is not set, then don't add another newline
diff --git a/src/rcfile.c b/src/rcfile.c
index abf9c07c7db95ba07a08fd01238a7adcc90a060d..3382a0d97b7ba7c1212eebff4351ab2719e0c930 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -42,16 +42,16 @@ static const rcoption rcopts[] = {
 #ifndef DISABLE_WRAPJUSTIFY
     {"fill", 0},
 #endif
-#ifndef NANO_TINY
-    {"locking", LOCKING},
+#ifndef DISABLE_HISTORIES
+    {"historylog", HISTORYLOG},
 #endif
+    {"morespace", MORE_SPACE},
 #ifndef DISABLE_MOUSE
     {"mouse", USE_MOUSE},
 #endif
 #ifndef DISABLE_MULTIBUFFER
     {"multibuffer", MULTIBUFFER},
 #endif
-    {"morespace", MORE_SPACE},
     {"nofollow", NOFOLLOW_SYMLINKS},
     {"nohelp", NO_HELP},
     {"nonewlines", NO_NEWLINES},
@@ -60,6 +60,9 @@ static const rcoption rcopts[] = {
 #endif
 #ifndef DISABLE_OPERATINGDIR
     {"operatingdir", 0},
+#endif
+#ifndef DISABLE_HISTORIES
+    {"poslog", POS_HISTORY},
 #endif
     {"preserve", PRESERVE},
 #ifndef DISABLE_JUSTIFY
@@ -79,19 +82,18 @@ static const rcoption rcopts[] = {
     {"tempfile", TEMP_FILE},
     {"view", VIEW_MODE},
 #ifndef NANO_TINY
+    {"allow_insecure_backup", INSECURE_BACKUP},
     {"autoindent", AUTOINDENT},
     {"backup", BACKUP_FILE},
-    {"allow_insecure_backup", INSECURE_BACKUP},
     {"backupdir", 0},
     {"backwards", BACKWARDS_SEARCH},
     {"casesensitive", CASE_SENSITIVE},
     {"cut", CUT_TO_END},
-    {"historylog", HISTORYLOG},
+    {"locking", LOCKING},
     {"matchbrackets", 0},
     {"noconvert", NO_CONVERT},
-    {"poslog", POS_HISTORY},
-    {"quiet", QUIET},
     {"quickblank", QUICK_BLANK},
+    {"quiet", QUIET},
     {"smarthome", SMART_HOME},
     {"smooth", SMOOTH_SCROLL},
     {"tabstospaces", TABS_TO_SPACES},