diff --git a/docs/Plugins.md b/docs/Plugins.md
index 25acce19..0e4ba7a2 100644
--- a/docs/Plugins.md
+++ b/docs/Plugins.md
@@ -325,6 +325,7 @@ These are the detection plugins included with the Monasca Agent.  See [Customiza
 | cert_check | ArgsPlugin |
 | check_mk_local | Plugin |
 | cinder | ServicePlugin |
+| cloudkitty | ServicePlugin |
 | crash | Plugin |
 | cue | ServicePlugin |
 | designate | ServicePlugin |
diff --git a/monasca_setup/detection/plugins/cloudkitty.py b/monasca_setup/detection/plugins/cloudkitty.py
new file mode 100644
index 00000000..c3f47f19
--- /dev/null
+++ b/monasca_setup/detection/plugins/cloudkitty.py
@@ -0,0 +1,32 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import monasca_setup.detection
+
+
+class Cloudkitty(monasca_setup.detection.ServicePlugin):
+
+    """Detect Cloudkitty daemons and setup configuration to monitor them."""
+
+    def __init__(self, template_dir, overwrite=True, args=None):
+        service_params = {
+            'args': args,
+            'template_dir': template_dir,
+            'overwrite': overwrite,
+            'service_name': 'rating',
+            'process_names': ['cloudkitty-processor',
+                              'cloudkitty-api'],
+            'service_api_url': 'http://localhost:8889',
+            'search_pattern': '.*EXPERIMENTAL.*',
+        }
+
+        super(Cloudkitty, self).__init__(service_params)