diff --git a/field_collection_uuid/controllers/UUIDFieldCollectionItemEntity.inc b/field_collection_uuid/controllers/UUIDFieldCollectionItemEntity.inc
new file mode 100644
index 0000000..21f6380
--- /dev/null
+++ b/field_collection_uuid/controllers/UUIDFieldCollectionItemEntity.inc
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains UUIDFieldCollectionItemEntity.
+ */
+
+/**
+ * Overrides save functionality from FieldCollectionItemEntity.
+ * 
+ * Avoid exceptions when deploying a field_collection entity before its host
+ * entity exists.
+ */
+class UUIDFieldCollectionItemEntity extends FieldCollectionItemEntity {
+
+  /**
+   * Save the field collection item.
+   */
+  public function save($skip_host_save = FALSE) {
+    if (isset($this->hostEntity)) {
+      // If we have a host entity save normally.
+      parent::save($skip_host_save);
+    }
+    else {
+      // If there is no host entity, we may be receiving it from deploy.
+      // so save the item directly.
+      entity_get_controller($this->entityType)->save($this);
+    }
+  }
+
+}
diff --git a/field_collection_uuid/field_collection_uuid.info b/field_collection_uuid/field_collection_uuid.info
new file mode 100644
index 0000000..c39834a
--- /dev/null
+++ b/field_collection_uuid/field_collection_uuid.info
@@ -0,0 +1,6 @@
+name = Field Collection UUID
+core = 7.x
+package = Fields
+dependencies[] = field_collection
+dependencies[] = uuid
+files[] = controllers/UUIDFieldCollectionItemEntity.inc
diff --git a/field_collection_uuid/field_collection_uuid.install b/field_collection_uuid/field_collection_uuid.install
new file mode 100644
index 0000000..7053cb5
--- /dev/null
+++ b/field_collection_uuid/field_collection_uuid.install
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Field Collection UUID installation and schema hooks.
+ */
+
+/**
+ * Implements hook_schema_alter().
+ */
+function field_collection_uuid_schema_alter(&$schema = array()) {
+  $field = uuid_schema_field_definition();
+  $schema['field_collection_item']['fields']['uuid'] = $field;
+  $schema['field_collection_item_revision']['fields']['vuuid'] = $field;
+}
+
+/**
+ * Implements hook_install().
+ */
+function field_collection_uuid_install() {
+  $field = uuid_schema_field_definition();
+  if (!db_field_exists('field_collection_item', 'uuid')) {
+    db_add_field('field_collection_item', 'uuid', $field);
+    db_add_index('field_collection_item', 'uuid', array('uuid'));
+  }
+  if (!db_field_exists('field_collection_item_revision', 'vuuid')) {
+    db_add_field('field_collection_item_revision', 'vuuid', $field);
+    db_add_index('field_collection_item_revision', 'vuuid', array('vuuid'));
+  }
+}
+
+/**
+ * Implements hook_enable().
+ */
+function field_collection_uuid_enable() {
+  uuid_sync_all();
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function field_collection_uuid_uninstall() {
+  db_drop_field('field_collection_item', 'uuid');
+  db_drop_index('field_collection_item', 'uuid');
+  db_drop_field('field_collection_item_revision', 'vuuid');
+  db_drop_index('field_collection_item_revision', 'vuuid');
+}
diff --git a/field_collection_uuid/field_collection_uuid.module b/field_collection_uuid/field_collection_uuid.module
new file mode 100644
index 0000000..8e9acff
--- /dev/null
+++ b/field_collection_uuid/field_collection_uuid.module
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @file
+ * Provide UUID support for field collections.
+ *
+ * This code is taken from this issue below to solve challenges with
+ * Field Collections - https://drupal.org/node/1817956.
+ * This also implements the VUUID for Field Collection revisions.
+ */
+
+/**
+ * Implements hook_entity_uuid_load().
+ */
+function field_collection_entity_uuid_load(&$entities, $entity_type) {
+  if ($entity_type == 'field_collection_item') {
+    entity_property_id_to_uuid($entities, 'field_collection_item', 'value');
+  }
+}
+
+/**
+ * Implements hook_entity_uuid_presave().
+ */
+function field_collection_entity_uuid_presave(&$entity, $entity_type) {
+  if ($entity_type == 'field_collection_item') {
+    entity_property_uuid_to_id($entity, 'field_collection_item', 'value');
+  }
+}
+
+/**
+ * Implements hook_field_uuid_load().
+ */
+function field_collection_field_uuid_load($entity_type, $entity, $field, $instance, $langcode, &$items) {
+  entity_property_id_to_uuid($items, 'field_collection_item', 'value');
+}
+
+/**
+ * Implements hook_field_uuid_presave().
+ */
+function field_collection_field_uuid_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
+  entity_property_uuid_to_id($items, 'field_collection_item', 'value');
+  // Update the revision_ids of the field to match the head revisions
+  // of the entities.
+  $entity_ids = array();
+  foreach ($items as $item) {
+    $entity_ids[] = $item['value'];
+  }
+
+  $field_collections = entity_load("field_collection_item", $entity_ids);
+  foreach ($items as &$item) {
+    $item['revision_id'] = $field_collections[$item['value']]->revision_id;
+  }
+}
+
+/**
+ * Implements hook_entity_info_alter().
+ */
+function field_collection_uuid_entity_info_alter(&$entity_info) {
+  // Set the properties bellow for field collection entity so UUIDs get
+  // created on sync.
+  $entity_info['field_collection_item']['uuid'] = TRUE;
+  $entity_info['field_collection_item']['entity keys']['uuid'] = 'uuid';
+  $entity_info['field_collection_item']['entity keys']['revision uuid'] = 'vuuid';
+  $entity_info['field_collection_item']['entity class'] = 'UUIDFieldCollectionItemEntity';
+}
+
+/**
+ * Implements hook_services_request_preprocess_alter().
+ */
+function field_collection_uuid_services_request_preprocess_alter($controller, &$args) {
+  foreach ($args as $i => $arg) {
+    if (is_array($arg) && isset($arg['type'])) {
+      foreach (field_info_instances($args[0], $arg['type']) as $field_value) {
+        if (isset($field_value['type']) && $field_value['type'] == "field_collection") {
+          foreach ($arg[$field_value['field_name']][LANGUAGE_NONE] as $delta => $value) {
+            $target = reset(entity_get_id_by_uuid('field_collection_item', array($value['value'])));
+            $args[$i][$field_value['field_name']][LANGUAGE_NONE][$delta] = array(
+              'value' => $target,
+              'revision_id' => db_query('SELECT MAX(revision_id) FROM {field_collection_item_revision}')->fetchField(),
+            );
+          }
+        }
+      }
+    }
+  }
+}