diff --git a/Manifest b/Manifest
index 4c78970..3fea257 100644
--- a/Manifest
+++ b/Manifest
@@ -5,6 +5,7 @@ README
 Rakefile
 TODO
 VERSION
+gem.watchr
 lib/phocus.rb
 lib/phocus/autodetect.rb
 phocus.gemspec
diff --git a/gem.watchr b/gem.watchr
new file mode 100644
index 0000000..1034e77
--- /dev/null
+++ b/gem.watchr
@@ -0,0 +1,39 @@
+# Run me with:
+#
+#   $ watchr gem.watchr
+#
+# Manifest file can be automatically generated with:
+# 
+#   $ cat .git/hooks/post-commit
+#   #!bin/sh
+#   git ls-files > Manifest
+#
+
+# --------------------------------------------------
+# Helpers
+# --------------------------------------------------
+def build
+  system "rake -s gemspec; rake -s gem"; puts
+end
+
+# --------------------------------------------------
+# Watchr Rules
+# --------------------------------------------------
+watch( '^Rakefile$' ) { build }
+watch( '^Manifest$' ) { build }
+watch( '^VERSION$'  ) { build }
+
+# --------------------------------------------------
+# Signal Handling
+# --------------------------------------------------
+# Ctrl-\
+Signal.trap('QUIT') do
+  puts " --- Building Gem ---\n\n"
+  build
+end
+
+# Ctrl-C
+Signal.trap('INT') { abort("\n") }
+
+
+# vim:ft=ruby
diff --git a/phocus.gemspec b/phocus.gemspec
index 9208f63..a505f7c 100644
--- a/phocus.gemspec
+++ b/phocus.gemspec
@@ -78,6 +78,7 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- gem.watchr
 - lib/phocus.rb
 - lib/phocus/autodetect.rb
 - phocus.gemspec