diff --git a/configure.in b/configure.in
index 7bc1e2dc866..53bbbd45fef 100644
--- a/configure.in
+++ b/configure.in
@@ -8150,7 +8150,11 @@ if test "${OS_TARGET}" = "WINNT"; then
   fi
 fi
 
-if test "${OS_TARGET}" = "WINNT" -o "${OS_ARCH}" = "Darwin" -o "${MOZ_WIDGET_TOOLKIT}" = "android" -o "${MOZ_WIDGET_TOOLKIT}" = "gtk2"; then
+if test "${OS_TARGET}" = "WINNT" -o \
+        "${OS_ARCH}" = "Darwin" -o \
+        "${MOZ_WIDGET_TOOLKIT}" = "android" -o \
+        "${MOZ_WIDGET_TOOLKIT}" = "gonk" -o \
+        "${MOZ_WIDGET_TOOLKIT}" = "gtk2"; then
     case "${target_cpu}" in
     i*86*|x86_64|arm)
         MOZ_ENABLE_SKIA=1
diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
index 3eaaa845599..a577f42ba62 100644
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -59,7 +59,7 @@ VPATH += \
 	$(srcdir)/src/sfnt \
 	$(NULL)
 
-ifeq (android,$(MOZ_WIDGET_TOOLKIT))
+ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gonk))
 OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(CAIRO_FT_CFLAGS)
 DEFINES += -DSK_FONTHOST_CAIRO_STANDALONE=0
 endif
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 657225925cc..99bc7b0a5e0 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -207,14 +207,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
             'SkThreadUtils_pthread_linux.cpp',
             'SkTime_Unix.cpp',
         ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    CPP_SOURCES += [
-        'SkThread_pthread.cpp',
-    ]
-
 # Separate 'if' from above, since the else below applies to all != 'android'
 # toolkits.
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS.skia += [
         'include/ports/SkTypeface_cairo.h',
     ]