diff -up ./chartbeat.admin.inc ./chartbeat.admin.inc
--- ./chartbeat.admin.inc	2009-11-11 11:30:41.000000000 -0500
+++ ./chartbeat.admin.inc	2011-06-16 14:52:20.000000000 -0400
@@ -11,11 +11,25 @@ function chartbeat_admin_settings() {
     '#description' => t('The user ID associated with your <a href="@chartbeat">Chartbeat</a> account.', array('@chartbeat' => 'http://chartbeat.com')),
     '#default_value' => variable_get('chartbeat_uid', ''),
   );
-  $form['chartbeat_domain'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Domain'),
-    '#description' => t('The domain to be reporting from on your account.'),
-    '#default_value' => variable_get('chartbeat_domain', ''),
-  );
+
+  if (module_exists('domain')) {
+    $domains = domain_domains();
+    foreach($domains as $domain) {
+      $form['chartbeat_domain_' . $domain['domain_id']] = array(
+        '#type' => 'textfield',
+        '#title' => $domain['sitename'] . ' ' . t('Domain'),
+        '#description' => t('The domain to be reporting from on your account.'),
+        '#default_value' => variable_get('chartbeat_domain', $domain['subdomain']),
+      );
+    }
+  }
+  else {
+    $form['chartbeat_domain'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Domain'),
+      '#description' => t('The domain to be reporting from on your account.'),
+      '#default_value' => variable_get('chartbeat_domain', ''),
+    );
+  }
   return system_settings_form($form);
 }
diff -up ./chartbeat.module ./chartbeat.module
--- ./chartbeat.module	2010-03-05 11:26:54.000000000 -0500
+++ ./chartbeat.module	2011-06-16 15:00:37.000000000 -0400
@@ -32,9 +32,18 @@ function chartbeat_init() {
   $uid = variable_get('chartbeat_uid', '');
   if (is_numeric($uid)) {
     drupal_set_html_head('<script type="text/javascript">var _sf_startpt=(new Date()).getTime()</script>');
+
+    if (module_exists('domain')) {
+      global $_domain;
+      $domain = variable_get('chartbeat_domain_' . $_domain['domain_id'], $_domain['subdomain']);
+    }
+    else {
+      $domain = variable_get('chartbeat_domain', '');
+    }
+
     drupal_add_js(array('chartbeat' => array(
       'uid' => (int)$uid,
-      'domain' => variable_get('chartbeat_domain', ''),
+      'domain' => $domain,
     )), 'setting');
   }
 }