diff --git a/calendar/lightning/build/universal.mk b/calendar/lightning/build/universal.mk
index 902302290ae..8273604b02a 100644
--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@@ -19,6 +19,7 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#   Philipp Kewisch <mozilla@kewis.ch>
 #
 # 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
@@ -47,7 +48,7 @@ include $(OBJDIR)/config/autoconf.mk
 
 postflight_all:
 	mkdir -p $(DIST_UNI)/xpi-stage
-	rm -rf $(DIST_UNI)/xpi-stage/*
+	rm -rf $(DIST_UNI)/xpi-stage/lightning*
 	cp -R $(DIST_PPC)/xpi-stage/lightning $(DIST_UNI)/xpi-stage
 	platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
 		$(DIST_PPC)/xpi-stage/lightning`; \
diff --git a/calendar/providers/gdata/install.rdf b/calendar/providers/gdata/install.rdf
index 67554d0cebe..239b3737492 100644
--- a/calendar/providers/gdata/install.rdf
+++ b/calendar/providers/gdata/install.rdf
@@ -58,8 +58,13 @@
       <Description>
         <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+#ifdef MOZILLA_1_8_BRANCH
         <em:minVersion>2.0a1</em:minVersion>
+        <em:maxVersion>2.0.0.*</em:maxVersion>
+#else
+        <em:minVersion>3.0a1pre</em:minVersion>
         <em:maxVersion>3.0a1</em:maxVersion>
+#endif
       </Description>
     </em:targetApplication>
 
diff --git a/calendar/providers/gdata/universal.mk b/calendar/providers/gdata/universal.mk
new file mode 100644
index 00000000000..93ffea1f5b2
--- /dev/null
+++ b/calendar/providers/gdata/universal.mk
@@ -0,0 +1,49 @@
+# ***** 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 Sun Microsystems code.
+#
+# The Initial Developer of the Original Code is
+#   Philipp Kewisch <mozilla@kewis.ch>
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+ifndef OBJDIR
+OBJDIR_PPC = $(MOZ_OBJDIR)/ppc
+OBJDIR_X86 = $(MOZ_OBJDIR)/i386
+DIST_PPC = $(OBJDIR_PPC)/dist
+DIST_X86 = $(OBJDIR_X86)/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
diff --git a/tools/tinderbox-configs/lightning/macosx/mozconfig b/tools/tinderbox-configs/lightning/macosx/mozconfig
index 53b8f3671e4..db2258c3221 100755
--- a/tools/tinderbox-configs/lightning/macosx/mozconfig
+++ b/tools/tinderbox-configs/lightning/macosx/mozconfig
@@ -6,6 +6,7 @@
 . $topsrcdir/build/macosx/universal/mozconfig
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 mk_add_options MOZ_CO_PROJECT=mail,calendar
 mk_add_options MOZ_MAKE_FLAGS="-j4"