diff --git a/deploy_addon_content/deploy_addon_content.info b/deploy_addon_content/deploy_addon_content.info
index 4fa490d..12e670d 100644
--- a/deploy_addon_content/deploy_addon_content.info
+++ b/deploy_addon_content/deploy_addon_content.info
@@ -22,18 +22,23 @@ features[rules_config][] = deploy_addon_content_remove_user_from_push_to_next_de
 features[rules_config][] = deploy_addon_content_remove_user_from_user_deploy_plan
 features[rules_config][] = rules_deploy_addon_add_block_to_ad_hoc_deploy_plan
 features[rules_config][] = rules_deploy_addon_add_block_to_push_to_next_deploy_plan
+features[rules_config][] = rules_deploy_addon_add_fpp_to_ad_hoc_deploy_plan
+features[rules_config][] = rules_deploy_addon_add_fpp_to_push_to_next_deploy_plan
 features[rules_config][] = rules_deploy_addon_add_node_to_ad_hoc_deploy_plan
 features[rules_config][] = rules_deploy_addon_add_node_to_push_to_next_deploy_plan
 features[rules_config][] = rules_deploy_addon_add_term_to_ad_hoc_deploy_plan
 features[rules_config][] = rules_deploy_addon_add_term_to_push_to_next_deploy_plan
 features[rules_config][] = rules_deploy_addon_remove_block_from_ad_hoc_deploy_plan
 features[rules_config][] = rules_deploy_addon_remove_block_from_push_to_next_deploy_plan
+features[rules_config][] = rules_deploy_addon_remove_fpp_from_ad_hoc_deploy_plan
+features[rules_config][] = rules_deploy_addon_remove_fpp_from_push_to_next_deploy_plan
 features[rules_config][] = rules_deploy_addon_remove_node_from_ad_hoc_deploy_plan
 features[rules_config][] = rules_deploy_addon_remove_node_from_push_to_next_deploy_plan
 features[rules_config][] = rules_deploy_addon_remove_term_from_ad_hoc_deploy_plan
 features[rules_config][] = rules_deploy_addon_remove_term_from_push_to_next_deploy_plan
 features[variable][] = deploy_adhoc_plan_name
 features[views_view][] = deploy_addon_manage_blocks
+features[views_view][] = deploy_addon_manage_fieldable_panels_panes
 features[views_view][] = deploy_addon_manage_files
 features[views_view][] = deploy_addon_manage_nodes
 features[views_view][] = deploy_addon_manage_terms
diff --git a/deploy_addon_content/deploy_addon_content.rules_defaults.inc b/deploy_addon_content/deploy_addon_content.rules_defaults.inc
index 6f86282..f60a7bb 100644
--- a/deploy_addon_content/deploy_addon_content.rules_defaults.inc
+++ b/deploy_addon_content/deploy_addon_content.rules_defaults.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * deploy_addon_content.rules_defaults.inc
@@ -119,6 +120,28 @@ function deploy_addon_content_default_rules_configuration() {
       ]
     }
   }');
+  $items['rules_deploy_addon_add_fpp_to_ad_hoc_deploy_plan'] = entity_import('rules_config', '{ "rules_deploy_addon_add_fpp_to_ad_hoc_deploy_plan" : {
+      "LABEL" : "Add Fieldable Panels Pane to User Deploy Plan",
+      "PLUGIN" : "action set",
+      "OWNER" : "rules",
+      "REQUIRES" : [ "deploy_adhoc_plan" ],
+      "USES VARIABLES" : { "fpp" : { "label" : "Fieldable Panels Pane", "type" : "fieldable_panels_pane" } },
+      "ACTION SET" : [
+        { "deploy_adhoc_plan_rules_action_add_to_managed_plan" : { "entity" : [ "fpp" ] } }
+      ]
+    }
+  }');
+  $items['rules_deploy_addon_add_fpp_to_push_to_next_deploy_plan'] = entity_import('rules_config', '{ "rules_deploy_addon_add_fpp_to_push_to_next_deploy_plan" : {
+      "LABEL" : "Add Fieldable Panels Pane to Push to Next Deploy Plan",
+      "PLUGIN" : "action set",
+      "OWNER" : "rules",
+      "REQUIRES" : [ "deploy" ],
+      "USES VARIABLES" : { "fpp" : { "label" : "Fieldable Panels Pane", "type" : "fieldable_panels_pane" } },
+      "ACTION SET" : [
+        { "deploy_rules_action_add_to_managed_plan" : { "plan_name" : "push_to_next", "entity" : [ "fpp" ] } }
+      ]
+    }
+  }');
   $items['rules_deploy_addon_add_node_to_ad_hoc_deploy_plan'] = entity_import('rules_config', '{ "rules_deploy_addon_add_node_to_ad_hoc_deploy_plan" : {
       "LABEL" : "Add Node to User Deploy Plan",
       "PLUGIN" : "action set",
@@ -185,6 +208,28 @@ function deploy_addon_content_default_rules_configuration() {
       ]
     }
   }');
+  $items['rules_deploy_addon_remove_fpp_from_ad_hoc_deploy_plan'] = entity_import('rules_config', '{ "rules_deploy_addon_remove_fpp_from_ad_hoc_deploy_plan" : {
+      "LABEL" : "Remove Fieldable Panels Pane from User Deploy Plan",
+      "PLUGIN" : "action set",
+      "OWNER" : "rules",
+      "REQUIRES" : [ "deploy_adhoc_plan" ],
+      "USES VARIABLES" : { "fpp" : { "label" : "Fieldable Panels Pane", "type" : "fieldable_panels_pane" } },
+      "ACTION SET" : [
+        { "deploy_adhoc_plan_manager_action_delete_from_plan" : { "entity" : [ "fpp" ] } }
+      ]
+    }
+  }');
+  $items['rules_deploy_addon_remove_fpp_from_push_to_next_deploy_plan'] = entity_import('rules_config', '{ "rules_deploy_addon_remove_fpp_from_push_to_next_deploy_plan" : {
+      "LABEL" : "Remove Fieldable Panels Pane from Push to Next Deploy Plan",
+      "PLUGIN" : "action set",
+      "OWNER" : "rules",
+      "REQUIRES" : [ "deploy" ],
+      "USES VARIABLES" : { "fpp" : { "label" : "Fieldable Panels Pane", "type" : "fieldable_panels_pane" } },
+      "ACTION SET" : [
+        { "deploy_manager_action_delete_from_plan" : { "plan_name" : "push_to_next", "entity" : [ "fpp" ] } }
+      ]
+    }
+  }');
   $items['rules_deploy_addon_remove_node_from_ad_hoc_deploy_plan'] = entity_import('rules_config', '{ "rules_deploy_addon_remove_node_from_ad_hoc_deploy_plan" : {
       "LABEL" : "Remove Node from User Deploy Plan",
       "PLUGIN" : "action set",
diff --git a/deploy_addon_content/deploy_addon_content.views_default.inc b/deploy_addon_content/deploy_addon_content.views_default.inc
index dbcf0b1..593bb67 100644
--- a/deploy_addon_content/deploy_addon_content.views_default.inc
+++ b/deploy_addon_content/deploy_addon_content.views_default.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * deploy_addon_content.views_default.inc
@@ -343,6 +344,263 @@ function deploy_addon_content_views_default_views() {
   $export['deploy_addon_manage_blocks'] = $view;
 
   $view = new view();
+  $view->name = 'deploy_addon_manage_fieldable_panels_panes';
+  $view->description = 'Add and remove Fieldable Panels Panes to and from deployment plans.';
+  $view->tag = 'default';
+  $view->base_table = 'fieldable_panels_panes';
+  $view->human_name = 'Deploy Add-on Content: Manage Fieldable Panels Panes';
+  $view->core = 7;
+  $view->api_version = '3.0';
+  $view->disabled = (!module_exists('fieldable_panels_panes') ? TRUE : FALSE);
+
+  /* Display: Master */
+  $handler = $view->new_display('default', 'Master', 'default');
+  $handler->display->display_options['title'] = 'Deploy Add-on Content: Manage Fieldable Panels Panes';
+  $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['access']['perm'] = 'edit deployment plans';
+  $handler->display->display_options['cache']['type'] = 'none';
+  $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE;
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '50';
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'views_bulk_operations' => 'views_bulk_operations',
+    'title' => 'title',
+    'bundle' => 'bundle',
+    'changed' => 'changed',
+    'delete_entity' => 'delete_entity',
+    'edit_entity' => 'edit_entity',
+    'nothing' => 'nothing',
+  );
+  $handler->display->display_options['style_options']['default'] = 'changed';
+  $handler->display->display_options['style_options']['info'] = array(
+    'views_bulk_operations' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'title' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'bundle' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'changed' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'delete_entity' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'edit_entity' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'nothing' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+  );
+  /* Footer: Create ad hoc deployment plan link */
+  $handler->display->display_options['footer']['area']['id'] = 'area';
+  $handler->display->display_options['footer']['area']['table'] = 'views';
+  $handler->display->display_options['footer']['area']['field'] = 'area';
+  $handler->display->display_options['footer']['area']['ui_name'] = 'Create ad hoc deployment plan link';
+  $handler->display->display_options['footer']['area']['empty'] = TRUE;
+  $handler->display->display_options['footer']['area']['content'] = '<p>If you do not see any user deploy plan options in the Bulk Operations list, you will need to <a href="/admin/config/content/deploy-addon/deploy-adhoc-plan?destination=admin/structure/deploy/content/fieldable-panels-panes">create your own deployment plan</a>.</p>';
+  $handler->display->display_options['footer']['area']['format'] = 'filtered_html';
+  /* No results behavior: Empty Text */
+  $handler->display->display_options['empty']['area']['id'] = 'area';
+  $handler->display->display_options['empty']['area']['table'] = 'views';
+  $handler->display->display_options['empty']['area']['field'] = 'area';
+  $handler->display->display_options['empty']['area']['ui_name'] = 'Empty Text';
+  $handler->display->display_options['empty']['area']['empty'] = TRUE;
+  $handler->display->display_options['empty']['area']['content'] = 'There are no fieldable panels panes to display.';
+  $handler->display->display_options['empty']['area']['format'] = 'plain_text';
+  /* Field: Bulk operations: Fieldable pane */
+  $handler->display->display_options['fields']['views_bulk_operations_1']['id'] = 'views_bulk_operations_1';
+  $handler->display->display_options['fields']['views_bulk_operations_1']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['fields']['views_bulk_operations_1']['field'] = 'views_bulk_operations';
+  $handler->display->display_options['fields']['views_bulk_operations_1']['label'] = '';
+  $handler->display->display_options['fields']['views_bulk_operations_1']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['views_bulk_operations_1']['vbo_settings']['display_type'] = '0';
+  $handler->display->display_options['fields']['views_bulk_operations_1']['vbo_settings']['enable_select_all_pages'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations_1']['vbo_settings']['row_clickable'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations_1']['vbo_settings']['force_single'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations_1']['vbo_settings']['entity_load_capacity'] = '10';
+  $handler->display->display_options['fields']['views_bulk_operations_1']['vbo_operations'] = array(
+    'rules_component::rules_deploy_addon_add_fpp_to_push_to_next_deploy_plan' => array(
+      'selected' => 1,
+      'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+    ),
+    'rules_component::rules_deploy_addon_add_fpp_to_ad_hoc_deploy_plan' => array(
+      'selected' => 1,
+      'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+    ),
+    'rules_component::rules_deploy_addon_remove_fpp_from_push_to_next_deploy_plan' => array(
+      'selected' => 1,
+      'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+    ),
+    'rules_component::rules_deploy_addon_remove_fpp_from_ad_hoc_deploy_plan' => array(
+      'selected' => 1,
+      'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+    ),
+  );
+  /* Field: Fieldable pane: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  /* Field: Fieldable pane: Bundle */
+  $handler->display->display_options['fields']['bundle']['id'] = 'bundle';
+  $handler->display->display_options['fields']['bundle']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['fields']['bundle']['field'] = 'bundle';
+  $handler->display->display_options['fields']['bundle']['machine_name'] = 0;
+  /* Field: Fieldable pane: changed date */
+  $handler->display->display_options['fields']['changed']['id'] = 'changed';
+  $handler->display->display_options['fields']['changed']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['fields']['changed']['field'] = 'changed';
+  $handler->display->display_options['fields']['changed']['label'] = 'Changed date';
+  $handler->display->display_options['fields']['changed']['date_format'] = 'short';
+  $handler->display->display_options['fields']['changed']['second_date_format'] = 'panopoly_time';
+  /* Field: Fieldable pane: Administrative delete link */
+  $handler->display->display_options['fields']['delete_entity']['id'] = 'delete_entity';
+  $handler->display->display_options['fields']['delete_entity']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['fields']['delete_entity']['field'] = 'delete_entity';
+  $handler->display->display_options['fields']['delete_entity']['label'] = '';
+  $handler->display->display_options['fields']['delete_entity']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['delete_entity']['element_label_colon'] = FALSE;
+  /* Field: Fieldable pane: Administrative edit link */
+  $handler->display->display_options['fields']['edit_entity']['id'] = 'edit_entity';
+  $handler->display->display_options['fields']['edit_entity']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['fields']['edit_entity']['field'] = 'edit_entity';
+  $handler->display->display_options['fields']['edit_entity']['label'] = '';
+  $handler->display->display_options['fields']['edit_entity']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['edit_entity']['element_label_colon'] = FALSE;
+  /* Field: Operations */
+  $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['ui_name'] = 'Operations';
+  $handler->display->display_options['fields']['nothing']['label'] = 'Operations';
+  $handler->display->display_options['fields']['nothing']['alter']['text'] = '<ul class="links inline">
+<li class="edit first">[edit_entity]</li>
+<li class="delete last">[delete_entity]</li>
+</ul>';
+  $handler->display->display_options['fields']['nothing']['element_default_classes'] = FALSE;
+  /* Filter criterion: Fieldable pane: Title */
+  $handler->display->display_options['filters']['title']['id'] = 'title';
+  $handler->display->display_options['filters']['title']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['filters']['title']['field'] = 'title';
+  $handler->display->display_options['filters']['title']['operator'] = 'contains';
+  $handler->display->display_options['filters']['title']['group'] = 1;
+  $handler->display->display_options['filters']['title']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
+  $handler->display->display_options['filters']['title']['expose']['label'] = 'Title';
+  $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
+  $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
+  $handler->display->display_options['filters']['title']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+    4 => 0,
+    5 => 0,
+  );
+  $handler->display->display_options['filters']['title']['expose']['autocomplete_items'] = '10';
+  $handler->display->display_options['filters']['title']['expose']['autocomplete_min_chars'] = '0';
+  $handler->display->display_options['filters']['title']['expose']['autocomplete_field'] = 'title';
+  $handler->display->display_options['filters']['title']['expose']['autocomplete_raw_suggestion'] = 1;
+  $handler->display->display_options['filters']['title']['expose']['autocomplete_raw_dropdown'] = 1;
+  $handler->display->display_options['filters']['title']['expose']['autocomplete_dependent'] = 0;
+  /* Filter criterion: Fieldable pane: Bundle */
+  $handler->display->display_options['filters']['bundle']['id'] = 'bundle';
+  $handler->display->display_options['filters']['bundle']['table'] = 'fieldable_panels_panes';
+  $handler->display->display_options['filters']['bundle']['field'] = 'bundle';
+  $handler->display->display_options['filters']['bundle']['group'] = 1;
+  $handler->display->display_options['filters']['bundle']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['bundle']['expose']['operator_id'] = 'bundle_op';
+  $handler->display->display_options['filters']['bundle']['expose']['label'] = 'Bundle';
+  $handler->display->display_options['filters']['bundle']['expose']['operator'] = 'bundle_op';
+  $handler->display->display_options['filters']['bundle']['expose']['identifier'] = 'bundle';
+  $handler->display->display_options['filters']['bundle']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+    4 => 0,
+    5 => 0,
+  );
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page');
+  $handler->display->display_options['path'] = 'admin/structure/deploy/content/fieldable-panels-panes';
+  $handler->display->display_options['menu']['type'] = 'tab';
+  $handler->display->display_options['menu']['title'] = 'Fieldable Panels Panes';
+  $handler->display->display_options['menu']['description'] = 'Add or remove Fieldable Panels Panes from deployment plan';
+  $handler->display->display_options['menu']['weight'] = '700';
+  $handler->display->display_options['menu']['name'] = 'management';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
+  $translatables['deploy_addon_manage_fieldable_panels_panes'] = array(
+    t('Master'),
+    t('Deploy Add-on Content: Manage Fieldable Panels Panes'),
+    t('more'),
+    t('Apply'),
+    t('Reset'),
+    t('Sort by'),
+    t('Asc'),
+    t('Desc'),
+    t('Items per page'),
+    t('- All -'),
+    t('Offset'),
+    t('« first'),
+    t('‹ previous'),
+    t('next ›'),
+    t('last »'),
+    t('<p>If you do not see any user deploy plan options in the Bulk Operations list, you will need to <a href="/admin/config/content/deploy-addon/deploy-adhoc-plan?destination=admin/structure/deploy/content/fieldable-panels-panes">create your own deployment plan</a>.</p>'),
+    t('There are no fieldable panels panes to display.'),
+    t('- Choose an operation -'),
+    t('Title'),
+    t('Bundle'),
+    t('Changed date'),
+    t('Operations'),
+    t('<ul class="links inline">
+<li class="edit first">[edit_entity]</li>
+<li class="delete last">[delete_entity]</li>
+</ul>'),
+    t('Page'),
+  );
+  $export['deploy_addon_manage_fieldable_panels_panes'] = $view;
+
+  $view = new view();
   $view->name = 'deploy_addon_manage_files';
   $view->description = 'Add and remove files to and from deployment plans.';
   $view->tag = 'default';