--- a/content/xbl/builtin/Makefile.in
+++ b/content/xbl/builtin/Makefile.in
@@ -43,17 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
 DIRS	= win
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DIRS	= mac
 else
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-DIRS	= gtk2
+ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
+DIRS	= unix
 else
 DIRS	= emacs
 endif
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk

rename from content/xbl/builtin/gtk2/Makefile.in
rename to content/xbl/builtin/unix/Makefile.in

rename from content/xbl/builtin/gtk2/jar.mn
rename to content/xbl/builtin/unix/jar.mn

rename from content/xbl/builtin/gtk2/platformHTMLBindings.xml
rename to content/xbl/builtin/unix/platformHTMLBindings.xml

--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -250,18 +250,18 @@ MAKEFILES_content="
   content/xul/templates/src/Makefile
   content/xul/templates/tests/Makefile
   content/xul/templates/tests/chrome/Makefile
   content/xbl/Makefile
   content/xbl/public/Makefile
   content/xbl/src/Makefile
   content/xbl/builtin/Makefile
   content/xbl/builtin/emacs/Makefile
-  content/xbl/builtin/gtk2/Makefile
   content/xbl/builtin/mac/Makefile
+  content/xbl/builtin/unix/Makefile
   content/xslt/Makefile
   content/xslt/public/Makefile
   content/xslt/src/Makefile
   content/xslt/src/base/Makefile
   content/xslt/src/xml/Makefile
   content/xslt/src/xpath/Makefile
   content/xslt/src/xslt/Makefile
   content/xslt/src/main/Makefile