diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a29fde9a74abeba2d31084ab0f785d6dc499e1a9..4a09a92b277d9fa887ce3d43aacdc2a99da85cfe 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,8 @@
 Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx
 --------------------------------
 
+- #908582 XiaN Vizjereij, alex_b: Fix "Cannot use object of type stdClass as
+  array" error in mappers/taxonomy.inc.
 - #906654 alex_b: Fix phantom subscriptions.
 - #867892 alex_b: PubSubHubbub - slow down import frequency of feeds that are
   subscribed to hub.
diff --git a/mappers/taxonomy.inc b/mappers/taxonomy.inc
index 10307678644800e890a6385ec18786cb853e4915..792795a209508d9a2d3e099663d5450c687a2b7c 100644
--- a/mappers/taxonomy.inc
+++ b/mappers/taxonomy.inc
@@ -95,13 +95,13 @@ function taxonomy_feeds_set_target(&$node, $key, $terms) {
   else {
     foreach ($terms as $term) {
       if ($term instanceof FeedsTermElement) {
-        $node->taxonomy[$vocabulary->vid][$term->tid] = $term->tid;
+        $node->taxonomy[$term->tid] = (object)$term;
       }
       // Check if a term already exists.
       elseif ($terms_found = taxonomy_get_term_by_name_vid($term, $vocabulary->vid)) {
         // If any terms are found add them to the node's taxonomy by found tid.
         foreach ($terms_found AS $term_found) {
-          $node->taxonomy[$vocabulary->vid][$term_found->tid] = $term_found->tid;
+          $node->taxonomy[$term_found->tid] = $term_found;
           if (!$vocabulary->multiple) {
             break;
           }