diff --git a/doc/fixes36.4 b/doc/fixes36.4
index e841af4f6..5865224cc 100644
--- a/doc/fixes36.4
+++ b/doc/fixes36.4
@@ -10,6 +10,7 @@ GDBPATH and GREPPATH from sysconf or -D... on compilation command line were
 	being processed even if PANICTRACE was disabled but only being freed
 	at end of game when that was enabled
 fix the article used in the message when your steed encounters a polymorph trap
+dozen-ish assorted spelling/typo fixes in messages and source comments
 
 
 Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository
diff --git a/src/bones.c b/src/bones.c
index f1ec5a8a3..0bf1a38cf 100644
--- a/src/bones.c
+++ b/src/bones.c
@@ -625,7 +625,7 @@ getbones()
 
     if (validate(nhfp, g.bones) != 0) {
         if (!wizard)
-            pline("Discarding unuseable bones; no need to panic...");
+            pline("Discarding unusable bones; no need to panic...");
         ok = FALSE;
     } else {
         ok = TRUE;
diff --git a/src/do.c b/src/do.c
index 9cf5669ad..6ca9f68cc 100644
--- a/src/do.c
+++ b/src/do.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	do.c	$NHDT-Date: 1575245055 2019/12/02 00:04:15 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.196 $ */
+/* NetHack 3.6	do.c	$NHDT-Date: 1576181796 2019/12/12 20:16:36 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.197 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Derek S. Ray, 2015. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -336,7 +336,7 @@ polymorph_sink()
         sym = S_altar;
         levl[u.ux][u.uy].typ = ALTAR;
         /* 3.6.3: this used to pass 'rn2(A_LAWFUL + 2) - 1' to
-           Align2mask() but it evaluates its argument more than once */
+           Align2amask() but that evaluates its argument more than once */
         algn = rn2(3) - 1; /* -1 (A_Cha) or 0 (A_Neu) or +1 (A_Law) */
         levl[u.ux][u.uy].altarmask = ((Inhell && rn2(3)) ? AM_NONE
                                       : Align2amask(algn));
diff --git a/src/hack.c b/src/hack.c
index b220059b8..b38ae799c 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -2839,7 +2839,7 @@ int x, y;
     if (!IS_DOOR(lev_p->typ))
         return FALSE;
     /* all rogue level doors are doorless but disallow diagonal access, so
-       we treat them as if their non-existant doors were actually present */
+       we treat them as if their non-existent doors were actually present */
     if (Is_rogue_level(&u.uz))
         return FALSE;
     return !(lev_p->doormask & ~(D_NODOOR | D_BROKEN));
diff --git a/src/options.c b/src/options.c
index 5cfbc84fd..7922a3cd4 100644
--- a/src/options.c
+++ b/src/options.c
@@ -393,7 +393,7 @@ static struct Comp_Opt {
     },
     { "statuslines",
 #ifdef CURSES_GRAPHICS
-      "2 or 3 lines for horizonal (bottom or top) status display",
+      "2 or 3 lines for horizontal (bottom or top) status display",
       20, SET_IN_GAME
 #else
       "2 or 3 lines for status display",
diff --git a/src/potion.c b/src/potion.c
index 3d3c639b0..d4058d583 100644
--- a/src/potion.c
+++ b/src/potion.c
@@ -2257,7 +2257,7 @@ dodip()
                           more_than_one ? " that you dipped into" : "",
                           newbuf);
             else
-                pline("Somehing happens.");
+                pline("Something happens.");
 
             if (old_dknown
                 && !objects[old_otyp].oc_name_known
diff --git a/src/shk.c b/src/shk.c
index 615ec3f3a..552fe34ff 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -4383,7 +4383,7 @@ const char *Izchak_speaks[] = {
     "%s says: 'These shopping malls give me a headache.'",
     "%s says: 'Slow down.  Think clearly.'",
     "%s says: 'You need to take things one at a time.'",
-    "%s says: 'I don't like poofy coffee... give me Columbian Supremo.'",
+    "%s says: 'I don't like poofy coffee... give me Colombian Supremo.'",
     "%s says that getting the devteam's agreement on anything is difficult.",
     "%s says that he has noticed those who serve their deity will prosper.",
     "%s says: 'Don't try to steal from me - I have friends in high places!'",
diff --git a/src/timeout.c b/src/timeout.c
index 894167da1..7fb57d40f 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -95,7 +95,7 @@ const struct propname {
     { UNCHANGING, "unchanging" },
     { REFLECTING, "reflecting" },
     { FREE_ACTION, "free action" },
-    { FIXED_ABIL, "fixed abilites" },
+    { FIXED_ABIL, "fixed abilities" },
     { LIFESAVED, "life will be saved" },
     {  0, 0 },
 };
@@ -1400,7 +1400,7 @@ long timeout;
         break; /* case [otyp ==] candelabrum|tallow_candle|wax_candle */
 
     default:
-        impossible("burn_object: unexpeced obj %s", xname(obj));
+        impossible("burn_object: unexpected obj %s", xname(obj));
         break;
     }
     if (need_newsym)
diff --git a/src/trap.c b/src/trap.c
index f260e687e..ca59b2069 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	trap.c	$NHDT-Date: 1569189770 2019/09/22 22:02:50 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.317 $ */
+/* NetHack 3.6	trap.c	$NHDT-Date: 1576274483 2019/12/13 22:01:23 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.325 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1588,7 +1588,7 @@ struct obj *otmp;
     switch (tt) {
     case ARROW_TRAP:
         if (!otmp) {
-            impossible("steed hit by non-existant arrow?");
+            impossible("steed hit by non-existent arrow?");
             return 0;
         }
         trapkilled = thitm(8, steed, otmp, 0, FALSE);
@@ -1596,7 +1596,7 @@ struct obj *otmp;
         break;
     case DART_TRAP:
         if (!otmp) {
-            impossible("steed hit by non-existant dart?");
+            impossible("steed hit by non-existent dart?");
             return 0;
         }
         trapkilled = thitm(7, steed, otmp, 0, FALSE);
@@ -1636,7 +1636,7 @@ struct obj *otmp;
                                             SUPPRESS_SADDLE, FALSE));
                 if (mdat != steed->data)
                     (void) strsubst(buf, "your ", "your new ");
-                You("have to adjust yourself in the saddle on %s.", buf);
+                You("adjust yourself in the saddle on %s.", buf);
             }
         }
         steedhit = TRUE;
diff --git a/win/curses/cursmain.c b/win/curses/cursmain.c
index fa76aa81e..434d85c55 100644
--- a/win/curses/cursmain.c
+++ b/win/curses/cursmain.c
@@ -211,8 +211,11 @@ curses_init_nhwindows(int *argcp UNUSED,
     getmaxyx(base_term, term_rows, term_cols);
     counting = FALSE;
     curses_init_options();
-    if ((term_rows < 15) || (term_cols < 40)) {
-        panic("Terminal too small.  Must be minumum 40 width and 15 height");
+    if (term_rows < 15 || term_cols < 40) {
+        panic("Terminal is too small; must have at least %s%s%s.",
+              (term_rows < 15) ? "15 rows" : "",
+              (term_rows < 15 && term_cols < 40) ? " and " : "",
+              (term_cols < 40) ? "40 columns" : "");
     }
     /* during line input, deletes the most recently typed character */
     erase_char = erasechar(); /* <delete>/<rubout> or possibly <backspace> */
diff --git a/win/curses/curswins.c b/win/curses/curswins.c
index 4734967c7..5dc6fc3fa 100644
--- a/win/curses/curswins.c
+++ b/win/curses/curswins.c
@@ -504,7 +504,7 @@ curses_puts(winid wid, int attr, const char *text)
     if (curses_is_menu(wid) || curses_is_text(wid)) {
         if (!curses_menu_exists(wid)) {
             impossible(
-                     "curses_puts: Attempted write to nonexistant window %d!",
+                     "curses_puts: Attempted write to nonexistent window %d!",
                        wid);
             return;
         }
diff --git a/win/tty/topl.c b/win/tty/topl.c
index 242ba78c7..042d1fd20 100644
--- a/win/tty/topl.c
+++ b/win/tty/topl.c
@@ -302,7 +302,7 @@ char c;
     register struct WinDesc *cw = wins[WIN_MESSAGE];
 
     if (cw == (struct WinDesc *) 0)
-        panic("Putsym window MESSAGE nonexistant");
+        panic("Putsym window MESSAGE nonexistent");
 
     switch (c) {
     case '\b':
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 8d60a5f7e..2c61f07e7 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -1055,7 +1055,7 @@ reset_role_filtering()
 
     add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
     add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
-             "Uncceptable alignments", MENU_UNSELECTED);
+             "Unacceptable alignments", MENU_UNSELECTED);
     setup_algnmenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
 
     end_menu(win, "Pick all that apply");