diff --git a/www/xpi-gdata_provider/Makefile b/www/xpi-gdata_provider/Makefile
index 5015f77a1873..b374eb42b726 100644
--- a/www/xpi-gdata_provider/Makefile
+++ b/www/xpi-gdata_provider/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gdata_provider
-PORTVERSION=	0.18
+PORTVERSION=	0.25
 DISTVERSIONSUFFIX=	-tb+sm
 CATEGORIES=	www deskutils
 
@@ -14,5 +14,10 @@ XPI_NUM=	4631
 XPI_ID=		{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
 
 NO_STAGE=	yes
+
+# XXX Remove me on next update!
+xpi-post-extract:
+	${RM} ${WRKSRC}/chrome/.ttt.sh.swp
+
 .include "../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-gdata_provider/distinfo b/www/xpi-gdata_provider/distinfo
index 51f36fb8a374..76b98d56ad52 100644
--- a/www/xpi-gdata_provider/distinfo
+++ b/www/xpi-gdata_provider/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpi/provider_for_google_calendar-0.18-tb+sm.xpi) = 0c35c2e26e1ee6eea50997f3bfd7b63ddbfbf55086fc3d0e286aac3756386882
-SIZE (xpi/provider_for_google_calendar-0.18-tb+sm.xpi) = 128986
+SHA256 (xpi/provider_for_google_calendar-0.25-tb+sm.xpi) = 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093
+SIZE (xpi/provider_for_google_calendar-0.25-tb+sm.xpi) = 115020
diff --git a/www/xpi-gdata_provider/pkg-plist b/www/xpi-gdata_provider/pkg-plist
index ab37a6147ad6..0a6053566045 100644
--- a/www/xpi-gdata_provider/pkg-plist
+++ b/www/xpi-gdata_provider/pkg-plist
@@ -7,8 +7,6 @@
 %%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-migration.js
 %%XPI_XPIDIR%%/chrome/gdata-provider/skin/gdata-event-dialog-reminder.css
 %%XPI_XPIDIR%%/chrome/gdata-provider/skin/reminder-action-sms.png
-%%XPI_XPIDIR%%/chrome/gdata-provider-bg/locale/bg/gdata.dtd
-%%XPI_XPIDIR%%/chrome/gdata-provider-bg/locale/bg/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale/ca/gdata.dtd
 %%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale/ca/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-cs/locale/cs/gdata.dtd
@@ -39,8 +37,6 @@
 %%XPI_XPIDIR%%/chrome/gdata-provider-ga-IE/locale/ga-IE/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale/gd/gdata.dtd
 %%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale/gd/gdata.properties
-%%XPI_XPIDIR%%/chrome/gdata-provider-gl/locale/gl/gdata.dtd
-%%XPI_XPIDIR%%/chrome/gdata-provider-gl/locale/gl/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale/hr/gdata.dtd
 %%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale/hr/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-hu/locale/hu/gdata.dtd
@@ -71,14 +67,6 @@
 %%XPI_XPIDIR%%/chrome/gdata-provider-ru/locale/ru/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale/sk/gdata.dtd
 %%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale/sk/gdata.properties
-%%XPI_XPIDIR%%/chrome/gdata-provider-sq/locale/sq/gdata.dtd
-%%XPI_XPIDIR%%/chrome/gdata-provider-sq/locale/sq/gdata.properties
-%%XPI_XPIDIR%%/chrome/gdata-provider-sv-SE/locale/sv-SE/gdata.dtd
-%%XPI_XPIDIR%%/chrome/gdata-provider-sv-SE/locale/sv-SE/gdata.properties
-%%XPI_XPIDIR%%/chrome/gdata-provider-tr/locale/tr/gdata.dtd
-%%XPI_XPIDIR%%/chrome/gdata-provider-tr/locale/tr/gdata.properties
-%%XPI_XPIDIR%%/chrome/gdata-provider-uk/locale/uk/gdata.dtd
-%%XPI_XPIDIR%%/chrome/gdata-provider-uk/locale/uk/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale/zh-CN/gdata.dtd
 %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale/zh-CN/gdata.properties
 %%XPI_XPIDIR%%/chrome/gdata-provider-zh-TW/locale/zh-TW/gdata.dtd
@@ -97,9 +85,6 @@
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider/content
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider/skin
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-bg/locale/bg
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-bg/locale
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-bg
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale/ca
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ca
@@ -145,9 +130,6 @@
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale/gd
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gd
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gl/locale/gl
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gl/locale
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gl
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale/hr
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hr
@@ -193,18 +175,6 @@
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale/sk
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sk
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sq/locale/sq
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sq/locale
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sq
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sv-SE/locale/sv-SE
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sv-SE/locale
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sv-SE
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-tr/locale/tr
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-tr/locale
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-tr
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-uk/locale/uk
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-uk/locale
-@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-uk
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale/zh-CN
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale
 @dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN