diff --git a/Manifest.txt b/Manifest.txt
index c37a6832..3cbedeea 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -7,6 +7,7 @@ README.md
 Rakefile
 TODO
 bin/puma
+bin/pumactl
 ext/puma_http11/PumaHttp11Service.java
 ext/puma_http11/ext_help.h
 ext/puma_http11/extconf.rb
@@ -19,8 +20,10 @@ ext/puma_http11/org/jruby/puma/Http11.java
 ext/puma_http11/org/jruby/puma/Http11Parser.java
 ext/puma_http11/puma_http11.c
 lib/puma.rb
+lib/puma/app/status.rb
 lib/puma/cli.rb
 lib/puma/const.rb
+lib/puma/control_cli.rb
 lib/puma/events.rb
 lib/puma/null_io.rb
 lib/puma/rack_patch.rb
@@ -31,6 +34,7 @@ puma.gemspec
 test/ab_rs.rb
 test/lobster.ru
 test/mime.yaml
+test/test_app_status.rb
 test/test_cli.rb
 test/test_http10.rb
 test/test_http11.rb
diff --git a/Rakefile b/Rakefile
index d6295f2d..66e63886 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@ HOE = Hoe.spec 'puma' do
   developer 'Evan Phoenix', 'evan@phx.io'
 
   spec_extras[:extensions] = ["ext/puma_http11/extconf.rb"]
-  spec_extras[:executables] = ['puma']
+  spec_extras[:executables] = ['puma', 'pumactl']
 
   dependency 'rack', '~> 1.2'
 
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index 3ac0f652..801dba33 100644
--- a/lib/puma/const.rb
+++ b/lib/puma/const.rb
@@ -71,7 +71,7 @@ module Puma
 
     PATH_INFO = 'PATH_INFO'.freeze
 
-    PUMA_VERSION = VERSION = "0.8.2".freeze
+    PUMA_VERSION = VERSION = "0.9.0".freeze
 
     PUMA_TMP_BASE = "puma".freeze
 
diff --git a/puma.gemspec b/puma.gemspec
index 8a4410a2..408c908b 100644
--- a/puma.gemspec
+++ b/puma.gemspec
@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "0.8.2"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2011-12-02"
+  s.date = "2011-12-06"
   s.description = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications.  It is designed for running rack apps only.\n\nWhat makes Puma so fast is the careful use of an Ragel extension to provide fast, accurate HTTP 1.1 protocol parsing. This makes the server scream without too many portability issues."
   s.email = ["evan@phx.io"]
-  s.executables = ["puma"]
+  s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/cli.rb", "lib/puma/const.rb", "lib/puma/events.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/lobster.ru", "test/mime.yaml", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/lobster.ru", "test/mime.yaml", "test/test_app_status.rb", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.10"
   s.summary = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications"
-  s.test_files = ["test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3