--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@@ -33,18 +33,18 @@
 # 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 *****
 
 ifndef OBJDIR
 OBJDIR_PPC = $(MOZ_OBJDIR)/ppc
 OBJDIR_X86 = $(MOZ_OBJDIR)/i386
-DIST_PPC = $(OBJDIR_PPC)/dist
-DIST_X86 = $(OBJDIR_X86)/dist
+DIST_PPC = $(OBJDIR_PPC)/mozilla/dist
+DIST_X86 = $(OBJDIR_X86)/mozilla/dist
 DIST_UNI = $(DIST_PPC)/universal
 OBJDIR = $(OBJDIR_PPC)
 endif
 
 include $(OBJDIR)/config/autoconf.mk
 
 postflight_all:
 	mkdir -p $(DIST_UNI)/xpi-stage

--- a/calendar/providers/gdata/universal.mk
+++ b/calendar/providers/gdata/universal.mk
@@ -32,18 +32,18 @@
 # 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 *****
 
 ifndef OBJDIR
 OBJDIR_PPC = $(MOZ_OBJDIR)/ppc
 OBJDIR_X86 = $(MOZ_OBJDIR)/i386
-DIST_PPC = $(OBJDIR_PPC)/dist
-DIST_X86 = $(OBJDIR_X86)/dist
+DIST_PPC = $(OBJDIR_PPC)/mozilla/dist
+DIST_X86 = $(OBJDIR_X86)/mozilla/dist
 DIST_UNI = $(DIST_PPC)/universal
 OBJDIR = $(OBJDIR_PPC)
 endif
 
 # This is fine as long as the gdata provider has no binary components.
 postflight_all:
 	mkdir -p $(DIST_UNI)/xpi-stage
 	cp $(DIST_PPC)/xpi-stage/gdata-provider.xpi $(DIST_UNI)/xpi-stage