diff --git a/ChangeLog b/ChangeLog
index 124bceeb18f03362fb03e069caee6798d43602b8..a6cd41b796d86c5d1ac0d29fda568d6a1f7b5d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,8 @@ Cvs code -
 	- Added the "Goto Directory" code (Rocco)
 	- Don't shift the size of the file is it's less than 1K. Fixed
 	  files less than 1K being displayed as 0B (Rocco).
+	- More Picoish keystrokes for the browser, ^P, ^N, etc, for up,
+	  down, etc, and add the consistent ^C to exit (Jim Knoble).
   do_writeout()
 	- New code to allow writing selected text to a separate file.
 	  When this is done, the current state is prserved.
diff --git a/files.c b/files.c
index 62dd5f722719fe098fb3949a609db77a0e26f6a9..8600c0a9b37865cfff261b5e504b1b7387e078fa 100644
--- a/files.c
+++ b/files.c
@@ -1298,22 +1298,28 @@ char *do_browser(char *inpath)
             break;
 #endif
 #endif
+	case NANO_UP_KEY:
 	case KEY_UP:
 	case 'u':
 	    if (selected - width >= 0)
 		selected -= width;
 	    break;
+	case NANO_BACK_KEY:
 	case KEY_LEFT:
+	case NANO_BACKSPACE_KEY:
+	case 127:
 	case 'l':
 	    if (selected > 0)
 		selected--;
 	    break;
 	case KEY_DOWN:
+	case NANO_DOWN_KEY:
 	case 'd':
 	    if (selected + width <= numents - 1)
 		selected += width;
 	    break;
 	case KEY_RIGHT:
+	case NANO_FORWARD_KEY:
 	case 'r':
 	    if (selected < numents - 1)
 		selected++;
@@ -1353,7 +1359,7 @@ char *do_browser(char *inpath)
 		selected = numents - 1;
 	    break;
 	case KEY_ENTER:
-	case NANO_CONTROL_M:
+	case NANO_ENTER_KEY:
 	case 's': /* More Pico compatibility */
 	case 'S':
 
@@ -1427,11 +1433,11 @@ char *do_browser(char *inpath)
 	    return do_browser(path);
 
 	/* Stuff we want to abort the browser */
-	case NANO_CONTROL_C:
 	case 'q':
 	case 'Q':
 	case 'e':	/* Pico compatibility, yeech */
 	case 'E':
+	case NANO_CANCEL_KEY:
 	case NANO_EXIT_FKEY:
 		abort = 1;
 		break;