diff --git a/Guardfile b/Guardfile
new file mode 100644
index 00000000..0171bad4
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,4 @@
+guard :rspec do
+  watch(%r{^spec/.+/.+_spec\.rb$})
+  watch('spec/spec_helper.rb')  { "spec" }
+end
diff --git a/serverspec.gemspec b/serverspec.gemspec
index c55ab32e..9c8834d4 100644
--- a/serverspec.gemspec
+++ b/serverspec.gemspec
@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "highline"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "growl"
 end