diff --git a/fieldable_panels_panes.info b/fieldable_panels_panes.info
index 836d6b1..36dbee4 100644
--- a/fieldable_panels_panes.info
+++ b/fieldable_panels_panes.info
@@ -7,6 +7,7 @@ dependencies[] = "views"
 dependencies[] = "field_ui"
 
 files[] = includes/PanelsPaneController.class.php
+files[] = includes/translation.handler.fieldable_panels_pane.inc
 files[] = plugins/views/fieldable_panels_panes_handler_argument_bundle.inc
 files[] = plugins/views/fieldable_panels_panes_handler_field_bundle.inc
 files[] = plugins/views/fieldable_panels_panes_handler_field_delete_entity.inc
diff --git a/fieldable_panels_panes.install b/fieldable_panels_panes.install
index e5f8747..3c54648 100644
--- a/fieldable_panels_panes.install
+++ b/fieldable_panels_panes.install
@@ -96,6 +96,13 @@ function fieldable_panels_panes_schema() {
         'default' => '',
         'description' => 'The Universally Unique Identifier.',
       ),
+      'language' => array(
+        'description' => 'The {languages}.language of this entity.',
+        'type' => 'varchar',
+        'length' => 12,
+        'not null' => TRUE,
+        'default' => '',
+      ),
     ),
     'primary key' => array('fpid'),
     'indexes' => array(
@@ -210,3 +217,19 @@ function fieldable_panels_panes_update_7105() {
   db_add_field('fieldable_panels_panes', 'link', array('type' => 'int', 'size' => 'tiny', 'description' => 'Whether or not this entity title will link to another page.'));
   db_add_field('fieldable_panels_panes', 'path', array('type' => 'varchar', 'length' => 255, 'description' => 'The path the title should link to.'));
 }
+
+/**
+ * Add language column.
+ */
+function fieldable_panels_panes_update_7106() {
+  // Make sure to add language field
+  if (!db_field_exists('fieldable_panels_panes', 'language')) {
+    db_add_field('fieldable_panels_panes', 'language', array(
+      'description' => 'The {languages}.language of this entity.',
+      'type' => 'varchar',
+      'length' => 12,
+      'not null' => TRUE,
+      'default' => '',
+    ));
+  }
+}
diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index ca14b2a..a82af8f 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -26,6 +26,7 @@ function fieldable_panels_panes_entity_info() {
         'revision' => 'vid',
         'bundle' => 'bundle',
         'label' => 'admin_title',
+        'language' => 'language',
         'uuid' => 'uuid',
         'revision uuid' => 'vuuid',
       ),
@@ -56,6 +57,16 @@ function fieldable_panels_panes_entity_info() {
       'creation callback' => 'fieldable_panels_panes_create',
       'access callback' => 'fieldable_panels_panes_access',
       'save callback' => 'fieldable_panels_panes_save',
+
+      // Entity translation support
+      'translation' => array(
+        'entity_translation' => array(
+          'class' => 'EntityTranslationFieldablePanelsPaneHandler',
+          'base path' =>  'admin/structure/fieldable-panels-panes/view/%fieldable_panels_panes',
+          'edit path' =>  'admin/structure/fieldable-panels-panes/view/%fieldable_panels_panes/edit',
+          'path wildcard' => '%fieldable_panels_panes',
+        ),
+      ),
     ),
   );
 }
@@ -761,6 +772,13 @@ function fieldable_panels_panes_get_base_context($entity = NULL) {
 function fieldable_panels_panes_entity_edit_form($form, &$form_state) {
   $entity = $form_state['entity'];
 
+  // Map these properties for entity translations.
+  $form['#entity_type'] = array(
+    '#type' => 'hidden',
+    '#value' => $entity->bundle,
+  );
+  $form_state['fieldable_panels_pane'] = $form_state['entity'];
+
   // fixes a bug in wysiwyg
   // oh wysiwyg. We need a better way to address this.
 //  drupal_add_css('sites/all/libraries/ckeditor/skins/kama/editor.css');
@@ -859,7 +877,12 @@ function fieldable_panels_panes_entity_edit_form($form, &$form_state) {
     '#default_value' => '',
   );
 
-  field_attach_form('fieldable_panels_pane', $entity, $form, $form_state);
+  $language = NULL;
+  if (function_exists('entity_language')) {
+    // entity_language() was added in Drupal 7.15.
+    $language = entity_language('fieldable_panels_pane', $entity);
+  }
+  field_attach_form('fieldable_panels_pane', $entity, $form, $form_state, $language);
 
   if (!empty($form_state['add submit'])) {
     $form['actions'] = array(
diff --git a/includes/translation.handler.fieldable_panels_pane.inc b/includes/translation.handler.fieldable_panels_pane.inc
new file mode 100644
index 0000000..e2fd933
--- /dev/null
+++ b/includes/translation.handler.fieldable_panels_pane.inc
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Fieldable panels pane translation handler for the translation module.
+ */
+
+
+/**
+ * Fieldable panels pane translation handler.
+ */
+class EntityTranslationFieldablePanelsPaneHandler extends EntityTranslationDefaultHandler {
+
+  public function __construct($entity_type, $entity_info, $entity) {
+    parent::__construct('fieldable_panels_pane', $entity_info, $entity);
+  }
+
+  public function getAccess($op) {
+    return fieldable_panels_panes_access($op, $this->entity);
+  }
+}