diff --git a/docs/sphinx/tutorial.rst b/docs/sphinx/tutorial.rst
index 754ac1ec..fe3f62e3 100644
--- a/docs/sphinx/tutorial.rst
+++ b/docs/sphinx/tutorial.rst
@@ -30,14 +30,14 @@ Let's start with a new wscript file in the directory '/tmp/myproject'::
 	def build(bld):
 		print("build!")
 
-We will also use a Waf binary file, for example waf-1.8.8, which we will copy in the project directory::
+We will also use a Waf binary file, for example waf-2.0.0, which we will copy in the project directory::
 
 	$ cd /tmp/myproject
-	$ wget https://waf.io/waf-1.8.8
+	$ wget https://waf.io/waf-2.0.0
 
 To execute the project, we will simply call the command as an argument to ``waf``::
 
-	$ ./waf-1.8.8 configure build
+	$ ./waf-2.0.0 configure build
 	configure!
 	build!
 
diff --git a/waflib/Scripting.py b/waflib/Scripting.py
index 9b0708cd..9f2e0907 100644
--- a/waflib/Scripting.py
+++ b/waflib/Scripting.py
@@ -336,7 +336,7 @@ def distclean(ctx):
 
 		# remove local waf cache folders
 		if not Options.commands:
-			for x in '.waf-1. waf-1. .waf3-1. waf3-1.'.split():
+			for x in '.waf-2 waf-2 .waf3-2 waf3-2'.split():
 				if f.startswith(x):
 					shutil.rmtree(fp, ignore_errors=True)
 
@@ -492,7 +492,7 @@ class Dist(Context.Context):
 		try:
 			return self.excl
 		except AttributeError:
-			self.excl = Node.exclude_regs + ' **/waf-1.8.* **/.waf-1.8* **/waf3-1.8.* **/.waf3-1.8* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*'
+			self.excl = Node.exclude_regs + ' **/waf-2.* **/.waf-2.* **/waf3-2.* **/.waf3-2.* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*'
 			if Context.out_dir:
 				nd = self.root.find_node(Context.out_dir)
 				if nd:
diff --git a/waflib/extras/codelite.py b/waflib/extras/codelite.py
index 95defddf..523302c0 100644
--- a/waflib/extras/codelite.py
+++ b/waflib/extras/codelite.py
@@ -589,10 +589,10 @@ class vsnode_project_view(vsnode_alias):
                 vsnode_alias.__init__(self, ctx, node, name)
                 self.tg = self.ctx() # fake one, cannot remove
                 self.exclude_files = Node.exclude_regs + '''
-waf-1.8.*
-waf3-1.8.*/**
-.waf-1.8.*
-.waf3-1.8.*/**
+waf-2*
+waf3-2*/**
+.waf-2*
+.waf3-2*/**
 **/*.sdf
 **/*.suo
 **/*.ncb
diff --git a/waflib/extras/msvs.py b/waflib/extras/msvs.py
index dd13be53..8aa2db0b 100644
--- a/waflib/extras/msvs.py
+++ b/waflib/extras/msvs.py
@@ -638,10 +638,10 @@ class vsnode_project_view(vsnode_alias):
 		vsnode_alias.__init__(self, ctx, node, name)
 		self.tg = self.ctx() # fake one, cannot remove
 		self.exclude_files = Node.exclude_regs + '''
-waf-1.8.*
-waf3-1.8.*/**
-.waf-1.8.*
-.waf3-1.8.*/**
+waf-2*
+waf3-2*/**
+.waf-2*
+.waf3-2*/**
 **/*.sdf
 **/*.suo
 **/*.ncb