diff --git a/ChangeLog b/ChangeLog
index 368aaa12468840841ad51276c1cbccc5281cc063..83cf13d55a90c4f8dba70ffae24b2af77a1724f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS Code
+nano-0.9.17 - 09/04/2000
 - General
 	- New shortcuts to toggle certain options that are normally only
 	  flags via Alt/Meta.  See Alt-C,E,I,K,M,P,X,Z.  New struct called
@@ -52,7 +52,6 @@ CVS Code
 	- Fixed check for string that only occurs on the same line failing
 	  (discovered by Ken Tyler).
 
-
 nano-0.9.16 - 08/09/2000
 - cut.c:
   do_cut_text()
diff --git a/NEWS b/NEWS
index bc27b53d4e5755b4e1ea6f751b49f35569deffc2..8ec5577ffe305ec76d64d9eadda80cd20db30a0f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+09/04/2000 - Nano 0.9.17, the Labor Day release, is released after a
+		quiet spell (almost an entire month since last release!)
+		New features include better (not yet perfect) binary
+		display support and toggle support for most of the program
+		flags (M-c, M-i, M-z, M-x, M-p, M-w, M-m, M-k and M-e for
+		-c, -i, -x, -p, -w, -k, and -R).
+
 08/09/2000 - Nano 0.9.16, after some struggling, is release.  This release
 		should fix a few of the holes that 0.9.15 dug.  The 
 		"cutting text on the first line" bug is fixed, as is the
diff --git a/nano.c b/nano.c
index 5156f4ebcec23cd8913439432b8ee8586f1c1af2..2cc33d9fbc31f8a577895e0a5d767f03f43f574d 100644
--- a/nano.c
+++ b/nano.c
@@ -1569,7 +1569,7 @@ void help_init(void)
 	    allocsize += strlen(main_list[i].help) + 15;
 
     /* And for the toggle list, we also allocate space for extra text. */
-    for (i = 0; i < TOGGLE_LEN; i++)
+    for (i = 0; i <= TOGGLE_LEN - 1; i++)
 	if (toggles[i].desc != NULL)
 	    allocsize += strlen(toggles[i].desc) + 30;
 
@@ -1610,7 +1610,7 @@ void help_init(void)
     }
 
     /* And the toggles... */
-    for (i = 0; i < TOGGLE_LEN - 1; i++) {
+    for (i = 0; i <= TOGGLE_LEN - 1; i++) {
 	sofar = snprintf(buf, BUFSIZ, 
 	"M-%c			", toggles[i].val - 32 );
 
diff --git a/po/nano.pot b/po/nano.pot
index 2c30e479b58ade67ce11fac423debbd3dbe3d734..c3871c7610d5bdcfac4c8de56084346604541d82 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-03 23:58-0400\n"
+"POT-Creation-Date: 2000-09-04 12:19-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"