diff --git a/ChangeLog b/ChangeLog
index a4ca7eb0..4b2c509d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ NEW IN WAF 1.8.0
 * LaTeX multibib #1345
 * Various improvements in the Python detection and processing
 * Rst document processing
+* Console handling improvements
+* Properly-sized progress bar on windows
 
 NEW IN WAF 1.7.11
 -----------------
diff --git a/waflib/Logs.py b/waflib/Logs.py
index a9da8100..2cc7b7b7 100644
--- a/waflib/Logs.py
+++ b/waflib/Logs.py
@@ -40,8 +40,6 @@ colors_lst = {
 
 def enable_colors(use):
 	if use == 1:
-		if os.environ.get('NOCOLOR', ''):
-			use = 0
 		if not (sys.stderr.isatty() or sys.stdout.isatty()):
 			use = 0
 		if Utils.is_win32:
diff --git a/waflib/Options.py b/waflib/Options.py
index 92de3638..a6305c26 100644
--- a/waflib/Options.py
+++ b/waflib/Options.py
@@ -51,7 +51,8 @@ class opt_parser(optparse.OptionParser):
 		self.ctx = ctx
 
 		jobs = ctx.jobs()
-		p('-c', '--color',    dest='colors',  default='auto', action='store', help='whether to use colors (yes/no/auto) [default: auto]', choices=('yes', 'no', 'auto'))
+		color = os.environ.get('NOCOLOR', '') and 'no' or 'auto'
+		p('-c', '--color',    dest='colors',  default=color, action='store', help='whether to use colors (yes/no/auto) [default: auto]', choices=('yes', 'no', 'auto'))
 		p('-j', '--jobs',     dest='jobs',    default=jobs, type='int', help='amount of parallel jobs (%r)' % jobs)
 		p('-k', '--keep',     dest='keep',    default=0,     action='count', help='keep running happily even if errors are found')
 		p('-v', '--verbose',  dest='verbose', default=0,     action='count', help='verbosity level -v -vv or -vvv [default: 0]')