diff --git a/cod.make b/cod.make
index 7701ee9..c64e405 100644
--- a/cod.make
+++ b/cod.make
@@ -7,6 +7,12 @@ api = 2
 core = 6.x
 
 ; Required versions of Drupal contributed projects.
+projects[acquia_connector][subdir] = contrib
+
+projects[acquia_search][subdir] = "contrib"
+
+projects[apachesolr][subdir] = contrib
+
 projects[admin][subdir] = contrib
 
 projects[cck][subdir] = contrib
@@ -36,7 +42,7 @@ projects[emfield][subdir] = contrib
 projects[fasttoggle][subdir] = contrib
 
 projects[flag][subdir] = contrib
-projects[flag][version] = 2.0-beta5
+projects[flag][version] = 2.0-beta7
 
 ; git checkout of Features 6.x-1.x
 projects[features][subdir] = contrib
@@ -50,7 +56,6 @@ projects[features][patch][] ="http://drupal.org/files/issues/features-profile-fi
 ; http://drupal.org/node/860974#comment-3505484
 projects[features][patch][] = "http://drupal.org/files/issues/features.860974.patch"
 
-
 projects[filefield][subdir] = contrib
 
 projects[globalredirect][subdir] = contrib
@@ -97,7 +102,6 @@ projects[uuid_features][download][type] = "git"
 projects[uuid_features][download][url] = "http://git.drupal.org/project/uuid_features.git"
 projects[uuid_features][download][revision] = "6.x-1.x"
 
-
 projects[ubercart][subdir] = contrib
 
 projects[views][subdir] = contrib
diff --git a/cod.profile b/cod.profile
index a75a7b9..56b7a56 100644
--- a/cod.profile
+++ b/cod.profile
@@ -157,11 +157,17 @@ function cod_profile_tasks(&$task, $url) {
     $task = 'cod-modules';
   }
 
-  // Install some more modules and maybe localization helpers too
+  // Install some more modules.
   if ($task == 'cod-modules') {
     $modules = _cod_profile_modules();
+    // If applicable, add Acquia connector modules to the
+    // list of modules to enable.
+    $enable_acquia_connector = variable_get('cod_enable_acquia_connector', 1);
+    if (!empty($enable_acquia_connector)) {
+      $modules = array_merge($modules, array('acquia_agent', 'acquia_spi'));
+    }
     $files = module_rebuild_cache();
-    // Create batch
+    // Create batch.
     foreach ($modules as $module) {
       $batch['operations'][] = array('_install_module_batch', array($module, $files[$module]->info['name']));
     }    
@@ -248,3 +254,27 @@ function system_form_install_select_profile_form_alter(&$form, $form_state) {
     $form['profile'][$key]['#value'] = 'cod';
   }
 }
+
+function system_form_install_configure_form_alter($form, $form_state) {
+  $form['acquia_connector'] = array(
+    '#type' => 'fieldset',
+    '#title' => st('Acquia Network'),
+      '#description' => st('The !an can supplement the functionality of COD with enhanced site search (faceted search, content recommendations, content biasing, multi-site search and other functionality via the Apache Solr service), spam protection (using the Mollom service), and more.  A free 30-day trial is available.', array('!an' => l(st('Acquia Network'), 'http://acquia.com/products-services/acquia-network', array('attributes' => array('target' => '_blank'))))),
+  );
+  $form['acquia_connector']['cod_enable_acquia_connector'] = array(
+    '#type' => 'checkbox',
+    '#title' => st('Acquia Network'),
+    '#default_value' => variable_get('cod_enable_acquia_connector', 1),
+    '#description' => st('Leave this checkbox enabled to use the Acquia Network with your existing subscription or with a free 30 day trial.'),
+  );
+  $form['#submit'][] = 'cod_install_configure_form_submit';
+
+}
+
+function cod_install_configure_form_submit($form, $form_state) {
+  // cod_enable_acquia_connector defaults to enabled, so we need to 
+  // specifically disable it the checkbox isn't specified.
+  if (empty($form_state['values']['cod_enable_acquia_connector'])) {
+    variable_set('cod_enable_acquia_connector', 0);
+  }
+}
\ No newline at end of file
diff --git a/drupal-org.make b/drupal-org.make
index b42f3bb..7d4f123 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -7,6 +7,12 @@ api = 2
 core = 6.x
 
 ; Required versions of Drupal contributed projects.
+projects[acquia_connector][subdir] = contrib
+
+projects[acquia_search][subdir] = "contrib"
+
+projects[apachesolr][subdir] = contrib
+
 projects[admin][subdir] = contrib
 
 projects[cck][subdir] = contrib
@@ -50,7 +56,6 @@ projects[features][patch][] ="http://drupal.org/files/issues/features-profile-fi
 ; http://drupal.org/node/860974#comment-3505484
 projects[features][patch][] = "http://drupal.org/files/issues/features.860974.patch"
 
-
 projects[filefield][subdir] = contrib
 
 projects[globalredirect][subdir] = contrib
@@ -92,13 +97,11 @@ projects[uuid][download][type] = "git"
 projects[uuid][download][url] = "http://git.drupal.org/project/uuid.git"
 projects[uuid][download][branch] = "6.x-1.x"
 
-
 projects[uuid_features][subdir] = contrib
 projects[uuid_features][download][type] = "git"
 projects[uuid_features][download][url] = "http://git.drupal.org/project/uuid_features.git"
 projects[uuid_features][download][branch] = "6.x-1.x"
 
-
 projects[ubercart][subdir] = contrib
 
 projects[views][subdir] = contrib
@@ -114,7 +117,6 @@ projects[fusion_swimmingly][download][branch] = "6.x-1.x"
 
 projects[fusion][type] = theme
 
-
 ; COD feature modules.
 projects[cod_support][subdir] = contrib 
 projects[cod_support][download][type] = git