diff --git a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
index e00bfd201c6..78c42f9070b 100644
--- a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
@@ -536,12 +536,12 @@ nsAccessibleWrap::TranslateStates(PRUint32 aState, PRUint32 aExtState, void *aAt
     if (aState & nsIAccessible::STATE_INVALID)
         atk_state_set_add_state (state_set, ATK_STATE_INVALID);
 
-#ifdef ATK_STATE_DEFAULT
+#if 0
     if (aState & nsIAccessible::STATE_DEFAULT)
         atk_state_set_add_state (state_set, ATK_STATE_DEFAULT);
 #endif
 
-#ifdef ATK_STATE_REQUIRED
+#ifdef USE_ATK_STATE_REQUIRED
     if (aState & nsIAccessible::STATE_REQUIRED)
         atk_state_set_add_state (state_set, ATK_STATE_REQUIRED);
 #endif
@@ -800,12 +800,12 @@ getRoleCB(AtkObject *aAtkObj)
             }
             accRole = linkRole;
         }
-#ifndef ATK_ROLE_AUTOCOMPLETE
+#ifndef USE_ATK_ROLE_AUTOCOMPLETE
         else if (accRole == nsIAccessible::ROLE_AUTOCOMPLETE) {
           accRole = ATK_ROLE_COMBO_BOX;
         }
 #endif
-#ifndef ATK_ROLE_CAPTION
+#ifndef USE_ATK_ROLE_CAPTION
         else if (accRole == nsIAccessible::ROLE_CAPTION) {
           accRole = ATK_ROLE_LABEL;
         }
diff --git a/mozilla/accessible/src/atk/nsAccessibleWrap.h b/mozilla/accessible/src/atk/nsAccessibleWrap.h
index 76758e8be86..8f4b5d5f2cb 100644
--- a/mozilla/accessible/src/atk/nsAccessibleWrap.h
+++ b/mozilla/accessible/src/atk/nsAccessibleWrap.h
@@ -51,6 +51,24 @@
 #define MAI_LOGGING
 #endif /* #ifdef PR_LOGGING */
 
+#if ATK_MAJOR_VERSION >=2 || \
+    (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION >= 4) || \
+    (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION == 3 && ATK_REV_VERSION >=3)
+#define USE_ATK_ROLE_AUTOCOMPLETE
+#endif
+
+#if ATK_MAJOR_VERSION >=2 || \
+    (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION >= 12) || \
+    (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION == 11 && ATK_REV_VERSION >=1)
+#define USE_ATK_ROLE_CAPTION
+#endif
+
+#if ATK_MAJOR_VERSION >=2 || \
+    (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION >= 11) || \
+    (ATK_MAJOR_VERSION == 1 && ATK_MINOR_VERSION == 10 && ATK_REV_VERSION >=1)
+#define USE_ATK_STATE_REQUIRED
+#endif
+
 struct _AtkObject;
 typedef struct _AtkObject AtkObject;
 
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 616e7f45541..ba0760795b9 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -7674,6 +7674,13 @@ fi
 
 if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK2" ; then
     AC_DEFINE(MOZ_ACCESSIBILITY_ATK)
+    ATK_FULL_VERSION=`$PKG_CONFIG --modversion atk`
+    ATK_MAJOR_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $1 }'`
+    ATK_MINOR_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $2 }'`
+    ATK_REV_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
+    AC_DEFINE_UNQUOTED(ATK_MAJOR_VERSION, $ATK_MAJOR_VERSION)
+    AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
+    AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
 fi
 
 # Used for LD_LIBRARY_PATH of run_viewer target