diff --git a/CHANGES b/CHANGES
index d3202fadb..a602204a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 == Version 1.1.5 (in git)
 
+IMPORTANT: use the new 'autospec' command instead of 'autotest'. We changed
+the way autotest discovers rspec so the autotest executable won't
+automatically load rspec anymore. This allows rspec to live side by side other
+spec frameworks without always co-opting autotest through autotest's discovery
+mechanism.
+
 * Added additional characters to be escaped in step strings (patch from Jake Cahoon). Closes #417.
 * Disable color codes on STDOUT when STDOUT.tty? is false (patch from Tim Pope). Closes #413.
 * mock(:null_object=>true) plays nice with HTML (patch from Gerrit Kaiser). Closes #230.
@@ -10,6 +16,7 @@
 * html story formatter correctly colors story/scenario red if step fails (Patch from Joseph Wilk). Closes #300
 * plain text story formatter correctly colors story/scenario red if step fails (Patch from Joseph Wilk). Closes #439
 * quiet deprecation warning on inflector - patch from RSL. Closes #430
+* added autospec executable
 
 == Version 1.1.4
 
diff --git a/Rakefile b/Rakefile
index 797e0424d..f15317298 100644
--- a/Rakefile
+++ b/Rakefile
@@ -88,7 +88,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$|^EXAMPLES.rd$/ }.to_a
 
   s.bindir = 'bin'
-  s.executables = ['spec', 'spec_translator']
+  s.executables = ['spec', 'spec_translator', 'autospec']
   s.default_executable = 'spec'
   s.author = "RSpec Development Team"
   s.email = "rspec-devel@rubyforge.org"
diff --git a/bin/autospec b/bin/autospec
new file mode 100755
index 000000000..c362a5808
--- /dev/null
+++ b/bin/autospec
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['RSPEC'] = 'true'
+system 'autotest'
\ No newline at end of file
diff --git a/lib/autotest/discover.rb b/lib/autotest/discover.rb
index 81914c3b7..e4c2c4d77 100644
--- a/lib/autotest/discover.rb
+++ b/lib/autotest/discover.rb
@@ -1,3 +1,3 @@
 Autotest.add_discovery do
-  "rspec" if File.exist?('spec')
+  "rspec" if File.exist?('spec') && ENV['RSPEC']
 end