--- a/calendar/makefiles.sh
+++ b/calendar/makefiles.sh
@@ -41,12 +41,13 @@
 if [ "$COMM_BUILD" ]; then
 
     add_makefiles "
     calendar/sunbird/Makefile
     calendar/sunbird/app/Makefile
     calendar/sunbird/base/Makefile
     calendar/sunbird/locales/Makefile
     $MOZ_BRANDING_DIRECTORY/Makefile
+    $MOZ_BRANDING_DIRECTORY/locales/Makefile
     "
 
    . ${srcdir}/calendar/shared_makefiles.sh
 fi

--- a/calendar/sunbird/branding/nightly/Makefile.in
+++ b/calendar/sunbird/branding/nightly/Makefile.in
@@ -36,21 +36,22 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = calendar/sunbird/branding/sunbird/locales
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DAB_CD=$(AB_CD)
+DIRS = \
+	locales \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/sunbird.ico       $(DIST)/branding/sunbird.ico
 	cp $(srcdir)/sunbird.ico       $(DIST)/branding/app.ico

--- a/calendar/sunbird/branding/nightly/jar.mn
+++ b/calendar/sunbird/branding/nightly/jar.mn
@@ -1,15 +1,7 @@
-#filter substitution
-
 sunbird.jar:
 % content branding %content/branding/
     content/branding/about.png                             (content/about.png)
     content/branding/aboutCredits.png                      (content/aboutCredits.png)
     content/branding/aboutFooter.png                       (content/aboutFooter.png)
     content/branding/icon64.png                            (content/icon64.png)
     content/branding/icon48.png                            (content/icon48.png)
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Calendar branding only exists in en-US
-  locale/branding/brand.dtd                                (locales/en-US/brand.dtd)
-* locale/branding/brand.properties                         (locales/en-US/brand.properties)

new file mode 100644
--- /dev/null
+++ b/calendar/sunbird/branding/nightly/locales/Makefile.in
@@ -0,0 +1,48 @@
+# ***** 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 Thunderbird unofficial branding.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Messaging
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Banner <bugzilla@standard8.plus.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@
+relativesrcdir = calendar/sunbird/branding/nightly/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
+
+include $(topsrcdir)/config/rules.mk

new file mode 100644
--- /dev/null
+++ b/calendar/sunbird/branding/nightly/locales/jar.mn
@@ -0,0 +1,7 @@
+#filter substitution
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Calendar branding only exists in en-US
+  locale/branding/brand.dtd                                (en-US/brand.dtd)
+* locale/branding/brand.properties                         (en-US/brand.properties)

--- a/other-licenses/branding/sunbird/Makefile.in
+++ b/other-licenses/branding/sunbird/Makefile.in
@@ -35,21 +35,22 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH = ../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = other-licenses/branding/sunbird/locales
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DAB_CD=$(AB_CD)
+DIRS = \
+	locales \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/sunbird.ico        $(DIST)/branding/sunbird.ico
 	cp $(srcdir)/sunbird.ico        $(DIST)/branding/app.ico

--- a/other-licenses/branding/sunbird/jar.mn
+++ b/other-licenses/branding/sunbird/jar.mn
@@ -1,14 +1,7 @@
-#filter substitution
-
 calendar.jar:
 % content branding %content/branding/ xpcnativewrappers=yes
    content/branding/about.png                              (content/about.png)
    content/branding/aboutCredits.png                       (content/aboutCredits.png)
    content/branding/aboutFooter.png                        (content/aboutFooter.png)
    content/branding/icon64.png                             (content/icon64.png)
    content/branding/icon48.png                             (content/icon48.png)
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-    locale/branding/brand.dtd                              (locales/en-US/brand.dtd)
-    locale/branding/brand.properties                       (locales/en-US/brand.properties)

new file mode 100644
--- /dev/null
+++ b/other-licenses/branding/sunbird/locales/Makefile.in
@@ -0,0 +1,48 @@
+# ***** 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 Thunderbird unofficial branding.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Messaging
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Banner <bugzilla@standard8.plus.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@
+relativesrcdir = other-licenses/branding/sunbird/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
+
+include $(topsrcdir)/config/rules.mk

new file mode 100644
--- /dev/null
+++ b/other-licenses/branding/sunbird/locales/jar.mn
@@ -0,0 +1,6 @@
+#filter substitution
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+    locale/branding/brand.dtd                              (%brand.dtd)
+    locale/branding/brand.properties                       (%brand.properties)