diff --git a/configure.in b/configure.in
index 4e17a2ad3e8..526238e8c6d 100644
--- a/configure.in
+++ b/configure.in
@@ -6280,7 +6280,7 @@ MOZ_ARG_DISABLE_BOOL(webapp-runtime,
 [  --disable-webapp-runtime  Disable Web App Runtime],
     MOZ_WEBAPP_RUNTIME=,
     MOZ_WEBAPP_RUNTIME=1)
-if test "$MOZ_WIDGET_TOOLKIT" != "windows" -a "$MOZ_WIDGET_TOOLKIT" != "cocoa" -a "$MOZ_WIDGET_TOOLKIT" != "gtk2"; then
+if test "$MOZ_WIDGET_TOOLKIT" != "windows" -a "$MOZ_WIDGET_TOOLKIT" != "cocoa" -a -z "$MOZ_WIDGET_GTK" ; then
     MOZ_WEBAPP_RUNTIME=
 fi
 if test "$OS_ARCH" = "WINNT" -a -z "$MAKENSISU" -a -n "$CROSS_COMPILE"; then
diff --git a/webapprt/gtk/Makefile.in b/webapprt/gtk/Makefile.in
index 38d8057c4a7..50a72b5f28a 100644
--- a/webapprt/gtk/Makefile.in
+++ b/webapprt/gtk/Makefile.in
@@ -4,7 +4,7 @@
 
 LIBS = \
   $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-  $(MOZ_GTK2_LIBS) \
+  $(TK_LIBS) \
   $(NULL)
 
 NSDISTMODE = copy
@@ -14,7 +14,7 @@ PROGRAMS_DEST = $(DIST)/bin
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += \
-	$(MOZ_GTK2_CFLAGS) \
+	$(TK_CFLAGS) \
 	$(NULL)
 
 GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
diff --git a/webapprt/moz.build b/webapprt/moz.build
index 37e4b8235c7..92ba5035a45 100644
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -8,7 +8,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['win']
 elif CONFIG['OS_ARCH'] == 'Darwin':
     DIRS += ['mac']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
+elif CONFIG['MOZ_ENABLE_GTK']:
     DIRS += ['gtk']
 
 DIRS += ['locales']