diff --git a/extension.mk b/extension.mk
index b16f64f0..220f00cf 100644
--- a/extension.mk
+++ b/extension.mk
@@ -6,8 +6,7 @@ nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
 EXTRA_DIST = metadata.json.in
 
 metadata.json: metadata.json.in $(top_builddir)/config.status
-	$(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
-	    -e "s|[@]uuid@|$(uuid)|" \
+	$(AM_V_GEN) sed -e "s|[@]uuid@|$(uuid)|" \
 	    -e "s|[@]shell_current@|$(PACKAGE_VERSION)|" \
 	    -e "s|[@]url@|$(extensionurl)|" $< > $@
 
diff --git a/extensions/alternate-tab/extension.js b/extensions/alternate-tab/extension.js
index 68b27e94..20016361 100644
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -595,7 +595,7 @@ WindowList.prototype = {
 };
 
 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }
 
 function doAltTab(shellwm, binding, mask, window, backwards) {
diff --git a/extensions/alternate-tab/metadata.json.in b/extensions/alternate-tab/metadata.json.in
index 8aa86e35..d13c1b84 100644
--- a/extensions/alternate-tab/metadata.json.in
+++ b/extensions/alternate-tab/metadata.json.in
@@ -4,6 +4,5 @@
 "description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
 "original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
 "shell-version": [ "@shell_current@", "3.2" ],
-"localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
diff --git a/extensions/alternative-status-menu/extension.js b/extensions/alternative-status-menu/extension.js
index 3e542ef9..404e47d3 100644
--- a/extensions/alternative-status-menu/extension.js
+++ b/extensions/alternative-status-menu/extension.js
@@ -1,4 +1,5 @@
 /* -*- mode: js2 - indent-tabs-mode: nil - js2-basic-offset: 4 -*- */
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
@@ -99,7 +100,7 @@ function createSubMenu() {
 
 // Put your extension initialization code here
 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }
 
 function reset(statusMenu) {
@@ -126,4 +127,4 @@ function disable() {
     statusMenu.menu.removeAll();
     statusMenu._createSubMenu();
     reset(statusMenu);
-}
\ No newline at end of file
+}
diff --git a/extensions/alternative-status-menu/metadata.json.in b/extensions/alternative-status-menu/metadata.json.in
index 91bb82f2..dc3fd7ba 100644
--- a/extensions/alternative-status-menu/metadata.json.in
+++ b/extensions/alternative-status-menu/metadata.json.in
@@ -3,6 +3,5 @@
  "name": "Alternative Status Menu",
  "description": "Replaces GNOME Shell Status Menu with one showing Suspend/Hibernate and Power Off as separate items",
  "shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
  "url": "@url@"
 }
diff --git a/extensions/apps-menu/metadata.json.in b/extensions/apps-menu/metadata.json.in
index 550bb818..9f409891 100644
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -3,6 +3,5 @@
 "name": "Applications Menu",
 "description": "Add a gnome 2.x style menu for applications",
 "shell-version": [ "@shell_current@", "3.2" ],
-"localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
diff --git a/extensions/auto-move-windows/metadata.json.in b/extensions/auto-move-windows/metadata.json.in
index c8aa6322..cf9b4339 100644
--- a/extensions/auto-move-windows/metadata.json.in
+++ b/extensions/auto-move-windows/metadata.json.in
@@ -3,7 +3,6 @@
  "name": "Auto Move Windows",
  "description": "Move applications to specific workspaces when they create windows",
  "shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
  "original-authors": [ "alessandro.crismani@gmail.com", "thomas.bouffon@gmail.com" ],
  "url": "@url@"
 }
diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
index 838d7b27..6e351a8d 100644
--- a/extensions/dock/extension.js
+++ b/extensions/dock/extension.js
@@ -935,7 +935,7 @@ DockIconMenu.prototype = {
 }
 
 function init(extensionMeta) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', extensionMeta.localedir);
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }
 
 let dock;
diff --git a/extensions/dock/metadata.json.in b/extensions/dock/metadata.json.in
index 96237b49..d9dca6c3 100644
--- a/extensions/dock/metadata.json.in
+++ b/extensions/dock/metadata.json.in
@@ -4,6 +4,5 @@
 "description": "A dock for the GNOME Shell -- displays favorite and running applications",
 "original-author": "tclaesson@gmail.com",
 "shell-version": [ "@shell_current@", "3.2" ],
-"localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
index c4551115..c05005fb 100644
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -91,7 +91,7 @@ DriveMenu.prototype = {
 
 // Put your extension initialization code here
 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }
 
 let _indicator;
diff --git a/extensions/drive-menu/metadata.json.in b/extensions/drive-menu/metadata.json.in
index def7c845..f5a834c3 100644
--- a/extensions/drive-menu/metadata.json.in
+++ b/extensions/drive-menu/metadata.json.in
@@ -3,6 +3,5 @@
  "name": "Removable Drive Menu",
  "description": "A status menu for accessing and unmounting removable devices",
  "shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
  "url": "@url@"
 }
diff --git a/extensions/example/extension.js b/extensions/example/extension.js
index ee591c9f..1826098f 100644
--- a/extensions/example/extension.js
+++ b/extensions/example/extension.js
@@ -19,7 +19,7 @@ function _showHello() {
 function init(metadata) {
     log ('Example extension initalized');
 
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }
 
 let signalId;
@@ -38,4 +38,4 @@ function disable() {
 	Main.panel.actor.disconnect(signalId);
 	signalId = 0;
     }
-}
\ No newline at end of file
+}
diff --git a/extensions/example/metadata.json.in b/extensions/example/metadata.json.in
index 239ae012..89402dde 100644
--- a/extensions/example/metadata.json.in
+++ b/extensions/example/metadata.json.in
@@ -3,6 +3,5 @@
  "name": "Hello, World!",
  "description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
  "shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
  "url": "@url@"
 }
diff --git a/extensions/gajim/metadata.json.in b/extensions/gajim/metadata.json.in
index d258ca48..d7aa6445 100644
--- a/extensions/gajim/metadata.json.in
+++ b/extensions/gajim/metadata.json.in
@@ -3,6 +3,5 @@
  "name": "Gajim IM integration",
  "description": "Display Gajim incoming chats as notifications in the Shell message tray.",
  "shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
  "url": "http://base-art.net"
 }
diff --git a/extensions/native-window-placement/metadata.json.in b/extensions/native-window-placement/metadata.json.in
index d6c7424c..798fb0dc 100644
--- a/extensions/native-window-placement/metadata.json.in
+++ b/extensions/native-window-placement/metadata.json.in
@@ -3,7 +3,6 @@
  "name": "Native Window Placement",
  "description": "Arrange windows in overview in a more native way",
  "shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
  "url": "@url@",
  "original-authors": [ "wepmaschda@gmx.de" ]
 }
diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
index 17bfe736..a871a81d 100644
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -114,7 +114,7 @@ PlacesMenu.prototype = {
 
 
 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }
 
 let _indicator;
diff --git a/extensions/places-menu/metadata.json.in b/extensions/places-menu/metadata.json.in
index 2ea72715..2e483c3b 100644
--- a/extensions/places-menu/metadata.json.in
+++ b/extensions/places-menu/metadata.json.in
@@ -3,6 +3,5 @@
 "name": "Places Status Indicator",
 "description": "Add a systems status menu for quickly navigating places in the system",
 "shell-version": [ "@shell_current@", "3.2" ],
-"localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
diff --git a/extensions/systemMonitor/metadata.json.in b/extensions/systemMonitor/metadata.json.in
index 2eb29cca..569e9d83 100644
--- a/extensions/systemMonitor/metadata.json.in
+++ b/extensions/systemMonitor/metadata.json.in
@@ -1,7 +1,6 @@
 {
     "shell-version": ["@shell_current@", "3.2" ],
     "uuid": "@uuid@",
-    "localedir": "@LOCALEDIR@",
     "original-author": "zaspire@rambler.ru",
     "name": "SystemMonitor",
     "description": "System Monitor",
diff --git a/extensions/windowsNavigator/metadata.json.in b/extensions/windowsNavigator/metadata.json.in
index 93bdb594..9dd84deb 100644
--- a/extensions/windowsNavigator/metadata.json.in
+++ b/extensions/windowsNavigator/metadata.json.in
@@ -1,7 +1,6 @@
 {
     "shell-version": ["@shell_current@", "3.2" ],
     "uuid": "@uuid@",
-    "localedir": "@LOCALEDIR@",
     "original-author": "zaspire@rambler.ru",
     "name": "windowNavigator",
     "description": "Allow keyboard selection of windows and workspaces in overlay mode",
diff --git a/extensions/workspace-indicator/metadata.json.in b/extensions/workspace-indicator/metadata.json.in
index 5a331fa9..851b55fa 100644
--- a/extensions/workspace-indicator/metadata.json.in
+++ b/extensions/workspace-indicator/metadata.json.in
@@ -3,7 +3,6 @@
     "name": "Workspace Indicator",
     "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one",
     "shell-version": [ "@shell_current@", "3.2" ],
-    "localedir": "@LOCALEDIR@",
     "original-authors": [ "erick.red@gmail.com" ],
     "url": "@url@"
 }
diff --git a/extensions/xrandr-indicator/extension.js b/extensions/xrandr-indicator/extension.js
index 979e549d..2f846d0d 100644
--- a/extensions/xrandr-indicator/extension.js
+++ b/extensions/xrandr-indicator/extension.js
@@ -137,7 +137,7 @@ Indicator.prototype = {
 
 
 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }
 
 let _indicator;
@@ -149,4 +149,4 @@ function enable() {
 
 function disable() {
     _indicator.destroy();
-}
\ No newline at end of file
+}
diff --git a/extensions/xrandr-indicator/metadata.json.in b/extensions/xrandr-indicator/metadata.json.in
index 0da402da..a1f8526c 100644
--- a/extensions/xrandr-indicator/metadata.json.in
+++ b/extensions/xrandr-indicator/metadata.json.in
@@ -3,6 +3,5 @@
 "name": "Monitor Status Indicator",
 "description": "Add a systems status menu for rotating monitors (overrides what is currently provided by gnome-settings-daemon)",
 "shell-version": [ "@shell_current@", "3.2" ],
-"localedir": "@LOCALEDIR@",
 "url": "@url@"
 }