--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -829,16 +829,50 @@ caps/idl/Makefile
 gfx/public/Makefile
 gfx/idl/Makefile
 widget/public/Makefile
 modules/libpref/public/Makefile
 content/base/public/Makefile
 intl/locale/public/Makefile
 "
 
+MAKEFILES_phoenix="
+browser/Makefile
+browser/app/Makefile
+browser/app/profile/extensions/Makefile
+browser/base/Makefile
+browser/components/Makefile
+browser/components/bookmarks/Makefile
+browser/components/bookmarks/public/Makefile
+browser/components/bookmarks/src/Makefile
+browser/components/build/Makefile
+browser/components/dirprovider/Makefile
+browser/components/history/Makefile
+browser/components/migration/Makefile
+browser/components/migration/public/Makefile
+browser/components/migration/src/Makefile
+browser/components/places/Makefile
+browser/components/preferences/Makefile
+browser/components/search/Makefile
+browser/components/sidebar/Makefile
+browser/components/sidebar/src/Makefile
+browser/components/shell/Makefile
+browser/components/shell/public/Makefile
+browser/components/shell/src/Makefile
+browser/installer/Makefile
+browser/installer/unix/Makefile
+browser/installer/windows/Makefile
+browser/locales/Makefile
+browser/themes/Makefile
+browser/themes/pinstripe/browser/Makefile
+browser/themes/pinstripe/Makefile
+browser/themes/winstripe/browser/Makefile
+browser/themes/winstripe/Makefile
+"
+
 MAKEFILES_xulrunner="
 xulrunner/Makefile
 xulrunner/app/Makefile
 xulrunner/app/profile/Makefile
 xulrunner/app/profile/chrome/Makefile
 xulrunner/app/profile/extensions/Makefile
 xulrunner/installer/Makefile
 xulrunner/installer/mac/Makefile
@@ -1348,16 +1382,20 @@ add_makefiles "
 if test -n "$MOZ_PSM"; then
     add_makefiles "$MAKEFILES_psm2"
 fi
 
 if test -n "$MOZ_CALENDAR"; then
     add_makefiles "$MAKEFILES_calendar"
 fi
 
+if test -n "$MOZ_PHOENIX"; then
+    add_makefiles "$MAKEFILES_phoenix"
+fi
+
 if test -n "$MOZ_XUL_APP"; then
     add_makefiles "$MAKEFILES_xulapp"
 fi
 
 if test -n "$MOZ_XULRUNNER"; then
     add_makefiles "$MAKEFILES_xulrunner"
 fi
 

deleted file mode 100644
--- a/browser/makefiles.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-# ***** 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 build system.
-#
-# The Initial Developer of the Original Code is
-# the Mozilla Foundation <http://www.mozilla.org/>.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Henrik Skupin <hskupin@gmail.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 *****
-
-add_makefiles "
-browser/Makefile
-browser/app/Makefile
-browser/app/profile/extensions/Makefile
-browser/base/Makefile
-browser/components/Makefile
-browser/components/bookmarks/Makefile
-browser/components/bookmarks/public/Makefile
-browser/components/bookmarks/src/Makefile
-browser/components/build/Makefile
-browser/components/dirprovider/Makefile
-browser/components/history/Makefile
-browser/components/migration/Makefile
-browser/components/migration/public/Makefile
-browser/components/migration/src/Makefile
-browser/components/places/Makefile
-browser/components/preferences/Makefile
-browser/components/search/Makefile
-browser/components/sidebar/Makefile
-browser/components/sidebar/src/Makefile
-browser/components/shell/Makefile
-browser/components/shell/public/Makefile
-browser/components/shell/src/Makefile
-browser/installer/Makefile
-browser/installer/unix/Makefile
-browser/installer/windows/Makefile
-browser/locales/Makefile
-browser/themes/Makefile
-browser/themes/pinstripe/browser/Makefile
-browser/themes/pinstripe/Makefile
-browser/themes/winstripe/browser/Makefile
-browser/themes/winstripe/Makefile
-"
-