diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index ba5658ef8..d8fc62869 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -7,7 +7,11 @@ bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
 
-2004.May.09 (0.9.14) [cvs]
+2004.May.13 (0.9.14) [cvs]
+  * Fixed "--noprint=yes" not working under Windows and BeOS.
+    Thanks to Adam Moore for pointing out this bug!
+    Bill Kendrick & Mark K. Kim
+
   * Updated Makefile for easier install.
     Mark K. Kim <tuxNO_SOLICITATIONpaint-dev@cbreak.org>
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 327c96f7f..ed095b0ba 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -7225,6 +7225,7 @@ void do_eraser(int x, int y)
 void reset_avail_tools(void)
 {
   int i;
+  int disallow_print = disable_print;  /* set to 1 later if printer unavail */
 
   for (i = 0; i < NUM_TOOLS; i++)
     {
@@ -7255,17 +7256,17 @@ void reset_avail_tools(void)
 
 
 #ifdef WIN32
-  disable_print = !IsPrinterAvailable();
+  if(!IsPrinterAvailable()) disallow_print = 1;
 #endif
 
 #ifdef __BEOS__
-  disable_print = !IsPrinterAvailable();
+  if(!IsPrinterAvailable()) disallow_print = 1;
 #endif
 
-  
+
   /* Disable print? */
 
-  if (disable_print)
+  if (disallow_print)
     tool_avail[TOOL_PRINT] = 0;
 }