diff --git a/allmakefiles.sh b/allmakefiles.sh
index 064be924434..094296d7b56 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -1050,7 +1050,7 @@ mail/components/compose/Makefile
 mail/components/addrbook/Makefile
 mail/components/preferences/Makefile
 mail/components/build/Makefile
-mail/components/gnome/Makefile
+mail/components/shell/Makefile
 mail/extensions/Makefile
 mail/extensions/smime/Makefile
 mail/extensions/offline/Makefile
diff --git a/mail/components/Makefile.in b/mail/components/Makefile.in
index c645a514255..43a8ade4a2e 100644
--- a/mail/components/Makefile.in
+++ b/mail/components/Makefile.in
@@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 DIRS    = compose preferences addrbook migration
 
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
-DIRS += gnome
+DIRS += shell
 endif
 
 DIRS += build
diff --git a/mail/components/build/Makefile.in b/mail/components/build/Makefile.in
index 9e4168f3e96..50384dcfab7 100644
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -68,7 +68,7 @@ CPPSRCS = nsModule.cpp \
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../migration/src \
-	-I$(srcdir)/../gnome \
+	-I$(srcdir)/../shell \
 	$(NULL)
 
 SHARED_LIBRARY_LIBS = \
diff --git a/mail/components/shell/Makefile.in b/mail/components/shell/Makefile.in
new file mode 100644
index 00000000000..697858eeb1e
--- /dev/null
+++ b/mail/components/shell/Makefile.in
@@ -0,0 +1,69 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla GNOME integration code.
+#
+# The Initial Developer of the Original Code is
+# IBM Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Brian Ryner <bryner@brianryner.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = mail_gnome
+LIBRARY_NAME = mail_gnome_s
+MODULE_NAME = nsMailGNOMEModule
+MOZILLA_INTERNAL_API = 1
+
+REQUIRES = \
+	xpcom \
+	string \
+	mozgnome \
+	msgbase \
+	appcomps \
+	appshell \
+	intl \
+	windowwatcher \
+	pref \
+	embed_base \
+	$(NULL)
+
+CPPSRCS = nsMailGNOMEIntegration.cpp
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += $(TK_CFLAGS)