diff --git a/includes/mailchimp.admin.inc b/includes/mailchimp.admin.inc
index 73a9b5b..e79dadc 100644
--- a/includes/mailchimp.admin.inc
+++ b/includes/mailchimp.admin.inc
@@ -16,6 +16,12 @@ function mailchimp_admin_settings() {
     '#default_value' => variable_get('mailchimp_api_key', ''),
     '#description' => t('The API key for your MailChimp account. Get or generate a valid API key at your !apilink.', array('!apilink' => l(t('MailChimp API Dashboard'), 'http://admin.mailchimp.com/account/api'))),
   );
+
+  // Use the Key module if it is available and integration is enabled.
+  if (module_exists('key') && key_integration_is_enabled('mailchimp_api')) {
+    $form['mailchimp_api_key']['#type'] = 'key';
+  }
+
   $form['mailchimp_cron'] = array(
     '#type' => 'checkbox',
     '#title' => 'Use batch processing.',
diff --git a/mailchimp.module b/mailchimp.module
index a9cbc9e..c9ed251 100644
--- a/mailchimp.module
+++ b/mailchimp.module
@@ -37,6 +37,17 @@ function mailchimp_libraries_info() {
 }
 
 /**
+ * Implements hook_ctools_plugin_directory().
+ *
+ * Tell CTools where to find plugins for this module.
+ */
+function mailchimp_ctools_plugin_directory($module, $plugin) {
+  if ($module == 'key' && !empty($plugin)) {
+    return "plugins/$plugin";
+  }
+}
+
+/**
  * Implements hook_menu().
  */
 function mailchimp_menu() {
@@ -125,6 +136,12 @@ function mailchimp_get_api_object() {
   }
 
   $api_key = variable_get('mailchimp_api_key', '');
+
+  // Use the Key module if it is available and integration is enabled.
+  if (module_exists('key') && key_integration_is_enabled('mailchimp_api')) {
+    $api_key = key_get_key($api_key);
+  }
+
   if (!strlen($api_key)) {
     watchdog('mailchimp', 'Mailchimp Error: API Key cannot be blank.', array(), WATCHDOG_ERROR);
     return NULL;
diff --git a/plugins/key_integration/mailchimp_api.inc b/plugins/key_integration/mailchimp_api.inc
index b424b82..0a549e0 100644
--- a/plugins/key_integration/mailchimp_api.inc
+++ b/plugins/key_integration/mailchimp_api.inc
@@ -2,11 +2,11 @@
 
 /**
  * @file
- * Plugin definition for the PayPal WPP Commerce payment method.
+ * Plugin definition for the MailChimp API.
  */
 
 $plugin = array(
-  'title' => t('PayPal WPP'),
-  'description' => t('Integration with the PayPal WPP Commerce payment method.'),
-  'type' => t('Commerce Payment'),
+  'title' => t('MailChimp API'),
+  'description' => t('Integration with the MailChimp API.'),
+  'type' => t('Web Services'),
 );