diff --git a/mail-client/thunderbird/thunderbird-24.0.ebuild b/mail-client/thunderbird/thunderbird-24.0.ebuild
index 35e15d7..65fad92 100644
--- a/mail-client/thunderbird/thunderbird-24.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.0.ebuild
@@ -308,20 +308,15 @@ src_install() {
 	fi
 
 	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		emid="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
 		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider-*.xpi
 
 		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
 		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning-*.xpi
 
 		# Fix mimetype so it shows up as a calendar application in GNOME 3
 		# This requires that the .desktop file was already installed earlier
@@ -336,9 +331,6 @@ src_install() {
 	# continue to work as expected.
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
 
-	# Plugins dir
-	share_plugins_dir
-
 	if use minimal; then
 		rm -rf "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
 			die "Failed to remove sdk and headers"