diff --git a/docs/OPTIONS.txt b/docs/OPTIONS.txt
index 7aae4806f..cdbcd9604 100644
--- a/docs/OPTIONS.txt
+++ b/docs/OPTIONS.txt
@@ -9,7 +9,7 @@ Options Documentation
                            bill@newbreedsoftware.com
                             http://www.tuxpaint.org/
 
-                                  July 1, 2009
+                                October 3, 2009
 
      ----------------------------------------------------------------------
 
@@ -357,6 +357,10 @@ Windows Users
                the controls, and only provides the default functionality
                (usually paint-mode).
 
+       nolabel=yes
+               Disables the Label tool: the tool that allows text entry which
+               can be edited later.
+
        mirrorstamps=yes
 
                For stamps that can be mirrored, this option sets them to
@@ -742,6 +746,7 @@ Windows Users
          --nostamps
          --nostampcontrols
          --nomagiccontrols
+         --nolabel
          --sysfonts
          --alllocalefonts
          --mirrorstamps
@@ -784,6 +789,7 @@ Windows Users
          --stamps
          --stampcontrols
          --magiccontrols
+         --label
          --nosysfonts
          --currentlocalefont
          --dontmirrorstamps
diff --git a/docs/html/OPTIONS.html b/docs/html/OPTIONS.html
index 2b67c38b0..64db6aa24 100644
--- a/docs/html/OPTIONS.html
+++ b/docs/html/OPTIONS.html
@@ -23,7 +23,7 @@ New Breed Software</p>
 <a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
 
 
-<p>July 1, 2009</p>
+<p>October 3, 2009</p>
 
 
 </center>
@@ -445,6 +445,12 @@ New Breed Software</p>
     functionality (usually paint-mode).
   </dd>
 
+  <dt><code><b>nolabel=yes</b></code></dt>
+  <dd>
+    Disables the <b>Label</b> tool: the tool that allows text entry
+    which can be edited later.
+  </dd>
+
   <dt><code><b>mirrorstamps=yes</b></code></dt>
   <dd>
     <p>For stamps that can be mirrored, this option sets them to their
@@ -1125,6 +1131,7 @@ New Breed Software</p>
     --nostamps<br>
     --nostampcontrols<br>
     --nomagiccontrols<br>
+    --nolabel<br>
     --sysfonts<br>
     --alllocalefonts<br>
     --mirrorstamps<br>
@@ -1170,6 +1177,7 @@ New Breed Software</p>
     --stamps<br>
     --stampcontrols<br>
     --magiccontrols<br>
+    --label<br>
     --nosysfonts<br>
     --currentlocalefont<br>
     --dontmirrorstamps<br>
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index b2b299f9f..fd36f9820 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2009.07.01
-.TH TUXPAINT 1 "1 July 2009" "0.9.22" "Tux Paint"
+.\" tuxpaint.1 - 2009.10.03
+.TH TUXPAINT 1 "3 October 2009" "0.9.22" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -59,6 +59,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-nomagiccontrols]
 .br
+[\-\-nolabel]
+.br
 [\-\-mirrorstamps]
 .br
 [\-\-stampsize=\fISIZE\fP]
@@ -131,6 +133,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-magiccontrols]
 .br
+[\-\-label]
+.br
 [\-\-dontmirrorstamps]
 .br
 [\-\-stampsize=default]
@@ -347,6 +351,11 @@ controlling whether a Magic tool is used like a paint brush, or if it
 affects the entire image at once.  (Note: Not all Magic tools will be
 controllable.)
 
+.TP 8
+.B \-\-nolabel \-\-label
+Disable or enable (default) the \fILabel\fP tool, which lets you create
+text which can be altered or moved later.
+
 .TP 8
 .B \-\-mirrorstamps \-\-dontmirrorstamps
 With \fImirrorstamps\fP set, stamps which can be mirrored will appear
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 5f5237f5e..c84b92782 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -5612,6 +5612,7 @@ static void show_usage(FILE * f, char *prg)
 	  "  %s [--sysfonts | --nosysfonts]\n"
 	  "  %s [--nostampcontrols | --stampcontrols]\n"
 	  "  %s [--nomagiccontrols | --magiccontrols]\n"
+          "  %s [--nolabel | --label]\n"
 	  "  %s [--mirrorstamps | --dontmirrorstamps]\n"
 	  "  %s [--stampsize=[0-10] | --stampsize=default]\n"
 	  "  %s [--saveoverask | --saveover | --saveovernew]\n"
@@ -5636,7 +5637,7 @@ static void show_usage(FILE * f, char *prg)
 	  blank, blank, blank, blank,
 	  blank, blank, blank, blank,
 	  blank, blank, blank, blank,
-	  blank, blank, blank,
+	  blank, blank, blank, blank,
 	  blank, blank, blank,
 	  blank, blank, blank, blank, blank, blank, blank, blank, blank,
 #ifdef WIN32
@@ -7000,7 +7001,7 @@ static void setup(int argc, char *argv[])
       }
     else if (strcmp(argv[i], "--label") == 0)
     {
-      disable_label = 1;
+      disable_label = 0;
     }
     else if (strcmp(argv[i], "--noshortcuts") == 0)
     {
@@ -16869,6 +16870,15 @@ static void parse_options(FILE * fi)
       {
 	disable_magic_controls = 0;
       }
+      else if (strcmp(str, "nolabel=yes") == 0)
+      {
+	disable_label = 1;
+      }
+      else if (strcmp(str, "nolabel=no") == 0 ||
+	       strcmp(str, "label=yes") == 0)
+      {
+	disable_label = 0;
+      }
       else if (strcmp(str, "mirrorstamps=yes") == 0)
       {
 	mirrorstamps = 1;