diff --git a/Gemfile b/Gemfile
index 88b1506..ca71dcb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,9 @@ gem "thor", ">= 0.14.0"
 group :development do
   gem "rake", ">= 0.8.7"
   gem "rspec", "~> 2.10"
+  gem "guard"
+  gem "guard-rspec"
+  gem "rb-readline", "~> 0.5.0"
   gem "jeweler", ">= 1.6.2"
   gem "rcov", :platforms => :mri_18
   gem "simplecov", :platforms => :mri_19
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..ee15012
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,9 @@
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/homesick/.*\.rb}) { "spec" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  notification :tmux, display_message: true
+end
+