diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index 695d5a372cb..7686ed4edfc 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -266,6 +266,9 @@ layout/xul/Makefile
 layout/xul/base/Makefile
 layout/xul/base/public/Makefile
 layout/xul/base/src/Makefile
+layout/xul/base/src/outliner/Makefile
+layout/xul/base/src/outliner/src/Makefile
+layout/xul/base/src/outliner/public/Makefile
 layout/xul/content/Makefile
 layout/xul/content/src/Makefile
 layout/xbl/Makefile
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index 8bb02ef9059..720453d1d5b 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -60,6 +60,7 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libgkxsldoc_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libgkxulcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libgkxulbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxuloutliner_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libgkxbl_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libgkbase_s.$(LIB_SUFFIX) \
 		$(NULL)
diff --git a/mozilla/layout/xul/base/src/outliner/Makefile.in b/mozilla/layout/xul/base/src/outliner/Makefile.in
new file mode 100644
index 00000000000..951ea3b69a3
--- /dev/null
+++ b/mozilla/layout/xul/base/src/outliner/Makefile.in
@@ -0,0 +1,32 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/layout/xul/base/src/outliner/src/Makefile.in b/mozilla/layout/xul/base/src/outliner/src/Makefile.in
new file mode 100644
index 00000000000..db3cc5f14b4
--- /dev/null
+++ b/mozilla/layout/xul/base/src/outliner/src/Makefile.in
@@ -0,0 +1,62 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE=raptor 
+LIBRARY_NAME=gkxuloutliner_s
+REQUIRES= xpcom dom locale js widget view caps timer docshell uriloader necko editor htmlparser webshell pref rdf intl
+
+CPPSRCS	= \
+ nsOutlinerBodyFrame.cpp \
+ nsOutlinerBoxObject.cpp \
+ nsOutlinerColFrame.cpp \
+ $(NULL)
+
+EXPORTS = \
+ nsOutlinerBodyFrame.h \
+ nsOutlinerColFrame.h \
+ $(NULL)
+
+DEFINES += -D_IMPL_NS_HTML
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir) \
+		-I$(srcdir)/../../../../base/src \
+		-I$(srcdir)/../../../../../html/style/src \
+		-I$(srcdir)/../../../../../html/base/src \
+		-I$(srcdir)/../../../../../html/forms/src \
+		-I$(srcdir)/../../../../content/src \
+		-I$(srcdir)/../../../../../xml/content/src \
+		-I$(srcdir)/../../../../../base/public \
+		-I$(srcdir)/../../../../../xul/base/src \
+		$(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
index d82826f8ac1..8a814fa2bc5 100644
--- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
@@ -834,4 +834,5 @@ NS_INTERFACE_MAP_BEGIN(nsOutlinerBodyFrame)
   NS_INTERFACE_MAP_ENTRY(nsIOutlinerBoxObject)
   NS_INTERFACE_MAP_ENTRY(nsICSSPseudoComparator)
   NS_INTERFACE_MAP_ENTRY(nsIScrollbarMediator)
-NS_INTERFACE_MAP_END_INHERITING(nsLeafFrame)
\ No newline at end of file
+NS_INTERFACE_MAP_END_INHERITING(nsLeafFrame)
+
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index d82826f8ac1..8a814fa2bc5 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -834,4 +834,5 @@ NS_INTERFACE_MAP_BEGIN(nsOutlinerBodyFrame)
   NS_INTERFACE_MAP_ENTRY(nsIOutlinerBoxObject)
   NS_INTERFACE_MAP_ENTRY(nsICSSPseudoComparator)
   NS_INTERFACE_MAP_ENTRY(nsIScrollbarMediator)
-NS_INTERFACE_MAP_END_INHERITING(nsLeafFrame)
\ No newline at end of file
+NS_INTERFACE_MAP_END_INHERITING(nsLeafFrame)
+