diff --git a/www/xpi-server_switcher/Makefile b/www/xpi-server_switcher/Makefile
index b3955e14d955..496084dea146 100644
--- a/www/xpi-server_switcher/Makefile
+++ b/www/xpi-server_switcher/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	server_switcher
-DISTVERSION=	0.3
+DISTVERSION=	0.4
 DISTVERSIONSUFFIX=	-fx+fl
 CATEGORIES=	www
 
diff --git a/www/xpi-server_switcher/distinfo b/www/xpi-server_switcher/distinfo
index d1f195e6be68..29acf1391b2b 100644
--- a/www/xpi-server_switcher/distinfo
+++ b/www/xpi-server_switcher/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/server_switcher-0.3-fx+fl.xpi) = 3375251ee8ff87f8f2cfdb08f895bd66
-SHA256 (xpi/server_switcher-0.3-fx+fl.xpi) = aaa026b5d73d8dfb5c1af53f97a67e92d730c335a7f0a921575edecae3e1b269
-SIZE (xpi/server_switcher-0.3-fx+fl.xpi) = 27673
+MD5 (xpi/server_switcher-0.4-fx+fl.xpi) = ea43f9998e666e33e4ae67d09180eba0
+SHA256 (xpi/server_switcher-0.4-fx+fl.xpi) = 1e12f55b21af3264e85a62ffc1f81543a5ed456bde2e15345fef01216891ed4c
+SIZE (xpi/server_switcher-0.4-fx+fl.xpi) = 29819
diff --git a/www/xpi-server_switcher/pkg-plist b/www/xpi-server_switcher/pkg-plist
index a0508856df43..2cabb7e18a34 100644
--- a/www/xpi-server_switcher/pkg-plist
+++ b/www/xpi-server_switcher/pkg-plist
@@ -1,42 +1,71 @@
-%%XPI_XPIDIR%%/chrome/switcher/content/about.xul
-%%XPI_XPIDIR%%/chrome/switcher/content/common/preferences.js
-%%XPI_XPIDIR%%/chrome/switcher/content/common/string.js
-%%XPI_XPIDIR%%/chrome/switcher/content/dialogs/serveradd.js
-%%XPI_XPIDIR%%/chrome/switcher/content/dialogs/serveradd.xul
-%%XPI_XPIDIR%%/chrome/switcher/content/switcherOptions.js
-%%XPI_XPIDIR%%/chrome/switcher/content/switcherOptions.xul
-%%XPI_XPIDIR%%/chrome/switcher/content/switcherOverlay.js
-%%XPI_XPIDIR%%/chrome/switcher/content/switcherOverlay.xul
-%%XPI_XPIDIR%%/chrome/switcher/locale/de-AT/about.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/de-AT/serveradd.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/de-AT/switcher.properties
-%%XPI_XPIDIR%%/chrome/switcher/locale/de-AT/switcherOptions.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/en-US/about.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/en-US/serveradd.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/en-US/switcher.properties
-%%XPI_XPIDIR%%/chrome/switcher/locale/en-US/switcherOptions.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/fr-FR/about.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/fr-FR/serveradd.dtd
-%%XPI_XPIDIR%%/chrome/switcher/locale/fr-FR/switcher.properties
-%%XPI_XPIDIR%%/chrome/switcher/locale/fr-FR/switcherOptions.dtd
-%%XPI_XPIDIR%%/chrome/switcher/skin/classic/devserver.png
-%%XPI_XPIDIR%%/chrome/switcher/skin/classic/hceswitch.css
-%%XPI_XPIDIR%%/chrome/switcher/skin/classic/icon.png
-%%XPI_XPIDIR%%/chrome/switcher/skin/classic/liveserver.png
+%%XPI_XPIDIR%%/chrome/content/about.xul
+%%XPI_XPIDIR%%/chrome/content/common/preferences.js
+%%XPI_XPIDIR%%/chrome/content/common/string.js
+%%XPI_XPIDIR%%/chrome/content/dialogs/serveradd.js
+%%XPI_XPIDIR%%/chrome/content/dialogs/serveradd.xul
+%%XPI_XPIDIR%%/chrome/content/switcherOptions.js
+%%XPI_XPIDIR%%/chrome/content/switcherOptions.xul
+%%XPI_XPIDIR%%/chrome/content/switcherOverlay.js
+%%XPI_XPIDIR%%/chrome/content/switcherOverlay.xul
+%%XPI_XPIDIR%%/chrome/locale/de-DE/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/de-DE/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/en-US/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-ES/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-ES/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-ES/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/es-ES/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/it-IT/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/it-IT/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/it-IT/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/it-IT/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/about.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/serveradd.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/switcher.properties
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/switcherOptions.dtd
+%%XPI_XPIDIR%%/chrome/skin/classic/devserver.png
+%%XPI_XPIDIR%%/chrome/skin/classic/hceswitch.css
+%%XPI_XPIDIR%%/chrome/skin/classic/icon.png
+%%XPI_XPIDIR%%/chrome/skin/classic/liveserver.png
 %%XPI_XPIDIR%%/chrome.manifest
 %%XPI_XPIDIR%%/defaults/preferences/prefs.js
 %%XPI_XPIDIR%%/install.rdf
 %%XPI_XPIDIR%%/license.txt
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/content/common
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/content/dialogs
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/content
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/locale/de-AT
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/locale/en-US
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/locale/fr-FR
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/locale
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/skin/classic
-@dirrm %%XPI_XPIDIR%%/chrome/switcher/skin
-@dirrm %%XPI_XPIDIR%%/chrome/switcher
+@dirrm %%XPI_XPIDIR%%/chrome/content/common
+@dirrm %%XPI_XPIDIR%%/chrome/content/dialogs
+@dirrm %%XPI_XPIDIR%%/chrome/content
+@dirrm %%XPI_XPIDIR%%/chrome/locale/de-DE
+@dirrm %%XPI_XPIDIR%%/chrome/locale/en-US
+@dirrm %%XPI_XPIDIR%%/chrome/locale/es-ES
+@dirrm %%XPI_XPIDIR%%/chrome/locale/fr-FR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/hr-HR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/it-IT
+@dirrm %%XPI_XPIDIR%%/chrome/locale/nl-NL
+@dirrm %%XPI_XPIDIR%%/chrome/locale/pt-BR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/uk-UA
+@dirrm %%XPI_XPIDIR%%/chrome/locale
+@dirrm %%XPI_XPIDIR%%/chrome/skin/classic
+@dirrm %%XPI_XPIDIR%%/chrome/skin
 @dirrm %%XPI_XPIDIR%%/chrome
 @dirrm %%XPI_XPIDIR%%/defaults/preferences
 @dirrm %%XPI_XPIDIR%%/defaults