diff --git a/entity.features.inc b/entity.features.inc
index 7b69115..f897e01 100644
--- a/entity.features.inc
+++ b/entity.features.inc
@@ -148,7 +148,11 @@ function entity_features_api() {
 /**
  * Features component callback.
  */
-function entity_features_export_options($feature, $entity_type) {
+function entity_features_export_options($feature_or_entity_type, $possible_entity_type = null) {
+  // Due to a change in the Features API the first parameter might be a
+  // feature object OR an entity type, depending on the Features version. This
+  // check is for backwards compatibility.
+  $entity_type = (is_string($feature_or_entity_type) ? $feature_or_entity_type : $possible_entity_type);
   return entity_features_get_controller($entity_type)->export_options();
 }