diff --git a/Makefile.in b/Makefile.in
index f4136236cf4..9792bdb065b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,14 +122,8 @@ endif
 #
 # tier 2 - base libraries
 # 
-tier_2_dirs	= js
-
-# MacOSX needs to build lib for MoreFiles before xpcom
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-tier_2_dirs += lib/mac/MoreFiles
-endif
-
-tier_2_dirs	+= \
+tier_2_dirs	= \
+		js \
 		xpcom \
 		modules/libreg \
 		xpcom/obsolete \
diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in
index c9a3cc9840d..34d2ea123a9 100644
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -30,6 +30,7 @@ MODULE		= xpcom
 GRE_MODULE	= 1
 
 DIRS		= \
+		MoreFiles \
 		typelib \
 		string \
 		glue \
diff --git a/xpcom/MoreFiles/Makefile.in b/xpcom/MoreFiles/Makefile.in
new file mode 100644
index 00000000000..130305c9607
--- /dev/null
+++ b/xpcom/MoreFiles/Makefile.in
@@ -0,0 +1,54 @@
+# 
+# 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 Mozilla.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications.  Portions created by Netscape Communications are
+# Copyright (C) 2001 by Netscape Communications.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+# ifeq for standalone builds
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+MODULE		= macmorefiles
+LIBRARY_NAME	= macmorefiles_s
+
+
+REQUIRES	= 
+
+CSRCS		=				\
+		MoreFilesX.c		\
+		FSCopyObject.c		\
+		$(NULL)
+
+EXPORTS		+=  \
+		MoreFilesX.h		\
+		FSCopyObject.h		\
+		$(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+FORCE_STATIC_LIB=1
+FORCE_USE_PIC=1
+
+endif
+
+include $(topsrcdir)/config/rules.mk