diff --git a/CHANGES.drake b/CHANGES.drake
index fe5fd8a16..d19284759 100644
--- a/CHANGES.drake
+++ b/CHANGES.drake
@@ -1,6 +1,11 @@
 
 = Drake Changelog
 
+== Version 0.8.2.1.0.7
+
+* new --rand option, suggested by Thomas Sawyer.
+* merged latest cleaned-up comp_tree
+
 == Version 0.8.2.1.0.6
 
 * Restored original 'multitask' behavior when -j1 (default)
diff --git a/drake.gemspec b/drake.gemspec
index 5016ca880..800d79668 100644
--- a/drake.gemspec
+++ b/drake.gemspec
@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drake
 version: !ruby/object:Gem::Version 
-  version: 0.8.2.1.0.6
+  version: 0.8.2.1.0.7
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -71,13 +71,13 @@ files:
 - lib/rake.rb
 - lib/rake/comp_tree/algorithm.rb
 - lib/rake/comp_tree/bucket_ipc.rb
+- lib/rake/comp_tree/diagnostic.rb
 - lib/rake/comp_tree/driver.rb
 - lib/rake/comp_tree/error.rb
+- lib/rake/comp_tree/misc.rb
 - lib/rake/comp_tree/node.rb
-- lib/rake/comp_tree/quix/builtin/kernel/tap.rb
-- lib/rake/comp_tree/quix/diagnostic.rb
-- lib/rake/comp_tree/quix/kernel.rb
 - lib/rake/comp_tree/retriable_fork.rb
+- lib/rake/comp_tree/tap.rb
 - lib/rake/comp_tree/task_node.rb
 - test/capture_stdout.rb
 - test/check_expansion.rb
diff --git a/lib/rake.rb b/lib/rake.rb
index 65d38e367..041d486fb 100755
--- a/lib/rake.rb
+++ b/lib/rake.rb
@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.2.1.0.6'
+RAKEVERSION = '0.8.2.1.0.7'
 
 require 'rbconfig'
 require 'getoptlong'