diff --git a/panopoly.profile b/panopoly.profile
index 2e99eac..cb2477c 100644
--- a/panopoly.profile
+++ b/panopoly.profile
@@ -13,7 +13,11 @@ function panopoly_install_tasks(&$install_state) {
 
   // Add the Panopoly app selection to the installation process
   require_once(drupal_get_path('module', 'apps') . '/apps.profile.inc');
-  $tasks = $tasks + apps_profile_install_tasks($install_state, array('machine name' => 'panopoly', 'default apps' => array('panopoly_demo')));
+  $tasks = $tasks + apps_profile_install_tasks($install_state, array(
+    'machine name' => 'panopoly',
+    'default apps' => array('panopoly_demo'),
+    'default content callback' => 'panopoly_default_content',
+  ));
 
   // Add the Panopoly theme selection to the installation process
   require_once(drupal_get_path('module', 'panopoly_theme') . '/panopoly_theme.profile.inc');
@@ -78,7 +82,30 @@ function panopoly_form_apps_profile_apps_select_form_alter(&$form, $form_state)
       }
     }
   }
+}
 
-  // Remove the demo content selection option since this is handled through the Panopoly demo module.
-  $form['default_content_fieldset']['#access'] = FALSE;
+/**
+ * Apps installer default content callback.
+ */
+function panopoly_default_content(&$modules) {
+  // TODO: It would be better to figure out which apps have demo content modules by looking
+  // at the app manifest. Unfortunately, this doesn't qute work because the manifest doesn't
+  // know about the default content module until the app has actually been enabled, since that
+  // data only comes in from hook_apps_app_info().
+  //
+  // apps_include('manifest');
+  // $apps = apps_apps('panopoly');
+  // foreach ($modules as $module) {
+  //   if (!empty($apps[$module]['demo content module'])) {
+  //     $modules[] = $apps[$module]['demo content module'];
+  //   }
+  // }
+  //
+  // This workaround assumes a pattern MYMODULE_demo which is probably not always true.
+  $files = system_rebuild_module_data();
+  foreach($modules as $module) {
+    if (isset($files[$module . '_demo'])) {
+      $modules[] = $module . '_demo';
+    }
+  }
 }