diff --git a/lib/sensu/api.rb b/lib/sensu/api.rb
index 40d30118..0b028d29 100644
--- a/lib/sensu/api.rb
+++ b/lib/sensu/api.rb
@@ -148,13 +148,18 @@ def self.setup(options={})
 
     aget '/checks' do
       $logger.debug('[checks] -- ' + request.ip + ' -- GET -- request for check list')
-      body $settings.checks.to_json
+      response = Array.new
+      $settings.checks.each do |check, details|
+        response.push(details.merge(:name => check))
+      end
+      body response.to_json
     end
 
     aget '/check/:name' do |check|
       $logger.debug('[check] -- ' + request.ip + ' -- GET -- request for check -- ' + check)
       if $settings.checks.key?(check)
-        body $settings.checks[check].to_json
+        response = $settings.checks[check].merge(:name => check)
+        body response.to_json
       else
         status 404
         body ''