diff --git a/commerce_kickstart.info b/commerce_kickstart.info
index d92ae06..72517c2 100644
--- a/commerce_kickstart.info
+++ b/commerce_kickstart.info
@@ -107,7 +107,6 @@ dependencies[] = commerce_kickstart_order
 dependencies[] = commerce_kickstart_payment
 dependencies[] = commerce_kickstart_comment
 dependencies[] = commerce_kickstart_migrate
-dependencies[] = commerce_kickstart_dfp
 
 ; System Requirements.
 php_memory_limit = 128M
diff --git a/commerce_kickstart.install b/commerce_kickstart.install
index a1ce136..de65b21 100644
--- a/commerce_kickstart.install
+++ b/commerce_kickstart.install
@@ -79,12 +79,18 @@ function commerce_kickstart_install_tasks_alter(&$tasks, $install_state) {
     $tasks[$install_state['active_task']]['dfp_settings'] += array(
       'dfp_unit' => 'Kickstart_Install',
     );
-    $prefix = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';
-    drupal_add_js($prefix . 'www.googletagservices.com/tag/js/gpt.js');
+
     drupal_add_js(array(
       'dfp' => $tasks[$install_state['active_task']]['dfp_settings'],
     ), 'setting');
-    drupal_add_js(drupal_get_path('profile', 'commerce_kickstart') . '/js/commerce_kickstart.js');
+
+    // If the user allows it add the dfp javascript.
+    if ($install_state['parameters']['use_dfp']) {
+      $prefix = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';
+      drupal_add_js($prefix . 'www.googletagservices.com/tag/js/gpt.js');
+
+      drupal_add_js(drupal_get_path('profile', 'commerce_kickstart') . '/js/commerce_kickstart.js');
+    }
   }
 }
 
@@ -133,6 +139,11 @@ function install_welcome($form, &$form_state, &$install_state) {
   $form['eula-accept'] = array(
     '#title' => st('I agree to the Privacy Policy and User Agreement'),
     '#type' => 'checkbox',
+  );
+  $form['dfp-accept'] = array(
+    '#title' => st('I would like to see relevant content.'),
+    '#type' => 'checkbox',
+    '#default_value' => TRUE,
     '#suffix' => '</div>',
   );
   $form['actions'] = array(
@@ -156,6 +167,7 @@ function install_welcome_submit($form, &$form_state) {
 
   $install_state['parameters']['welcome'] = 'done';
   $install_state['parameters']['locale'] = 'en';
+  $install_state['parameters']['use_dfp'] = $form_state['values']['dfp-accept'];
 }
 
 /**
@@ -302,6 +314,7 @@ function commerce_kickstart_configure_store_form_submit(&$form, &$form_state) {
  * after that.
  */
 function commerce_kickstart_install_additional_modules() {
+  global $install_state;
   $install_demo_store = variable_get('commerce_kickstart_demo_store', FALSE);
   if ($install_demo_store) {
     $modules = array(
@@ -415,6 +428,11 @@ function commerce_kickstart_install_additional_modules() {
     $modules[] = 'commerce_paypal_ec';
   }
 
+  // Enable the commerce_kickstart_dfp module
+  if ($install_state['parameters']['use_dfp']) {
+    $modules[] = 'commerce_kickstart_dfp';
+  }
+
   // Resolve the dependencies now, so that module_enable() doesn't need
   // to do it later for each individual module (which kills performance).
   $files = system_rebuild_module_data();