diff --git a/mozilla/accessible/public/nsIAccessible.idl b/mozilla/accessible/public/nsIAccessible.idl
index fa85d70c127..2c7c5387d3c 100644
--- a/mozilla/accessible/public/nsIAccessible.idl
+++ b/mozilla/accessible/public/nsIAccessible.idl
@@ -313,6 +313,8 @@ interface nsIAccessible : nsISupports
 
 /**
  * Relation Types -- most of these come from ATK's atkrelationtype.h
+ * When adding support for relations, make sure to add them to appropriate
+ * places in nsAccessibleWrap implementations
  * RELATION_NULL:
  * RELATION_CONTROLLED_BY:    Controlled by one or more target objects.
  * RELATION_CONTROLLER_FOR:   Controller for one or more target objects.
diff --git a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
index 757f1267662..8f9868cdacd 100644
--- a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
@@ -947,6 +947,13 @@ refRelationSetCB(AtkObject *aAtkObj)
     PRUint32 relationType[] = {nsIAccessible::RELATION_LABELLED_BY,
                                nsIAccessible::RELATION_LABEL_FOR,
                                nsIAccessible::RELATION_NODE_CHILD_OF,
+                               nsIAccessible::RELATION_CONTROLLED_BY,
+                               nsIAccessible::RELATION_CONTROLLER_FOR,
+#ifdef USE_ATK_EMBED_RELATIONS
+                               nsIAccessible::RELATION_EMBEDS,
+#endif
+                               nsIAccessible::RELATION_FLOWS_TO,
+                               nsIAccessible::RELATION_FLOWS_FROM,
 #ifdef USE_ATK_DESCRIPTION_RELATIONS
                                nsIAccessible::RELATION_DESCRIBED_BY,
                                nsIAccessible::RELATION_DESCRIPTION_FOR,
diff --git a/mozilla/accessible/src/atk/nsAccessibleWrap.h b/mozilla/accessible/src/atk/nsAccessibleWrap.h
index b328008ab30..d7f607800c3 100644
--- a/mozilla/accessible/src/atk/nsAccessibleWrap.h
+++ b/mozilla/accessible/src/atk/nsAccessibleWrap.h
@@ -66,6 +66,7 @@
     (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION >= 2) || \
     (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION == 1 && ATK_REV_VERSION >=3)
 #define USE_ATK_ROLE_APPLICATION
+#define USE_ATK_EMBED_RELATIONS
 #endif
 
 // ATK 1.3.3 or later
diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp
index 4ce425bcfed..ea547d59275 100644
--- a/mozilla/accessible/src/base/nsAccessible.cpp
+++ b/mozilla/accessible/src/base/nsAccessible.cpp
@@ -2148,6 +2148,8 @@ already_AddRefed<nsIDOMNode> nsAccessible::GetInverseRelatedNode(nsIAtom *aRelat
 /* nsIAccessible getAccessibleRelated(); */
 NS_IMETHODIMP nsAccessible::GetAccessibleRelated(PRUint32 aRelationType, nsIAccessible **aRelated)
 {
+  // When adding support for relations, make sure to add them to
+  // appropriate places in nsAccessibleWrap implementations
   *aRelated = nsnull;
 
   // Relationships are defined on the same content node