diff --git a/debian/changelog b/debian/changelog
index 483185ec..104f8f9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,12 +19,14 @@ gnome-shell-extensions (3.2.3-1) UNRELEASED; urgency=low
   * Drop patches which have been merged upstream:
     - debian/patches/upstream/*
     - debian/patches/fix-*
-  * Refresh debian/patches/01_status-menu_disable_accounts.patch.
-  * Add debian/patches/02-Revert-all-remove-all-GSettings-usage.patch: Use
-    GSettings since we install the extensions system-wide.
+  * Refresh 01_status-menu_disable_accounts.patch.
+  * Add 02-Revert-all-remove-all-GSettings-usage.patch: Use GSettings since we
+    install the extensions system-wide.
   * Use dh-autoreconf to generate the build system.
+  * Add 03-Revert-Remove-all-references-to-localedir-from-metad.patch: Use
+    locales from system-wide location.
 
- -- Michael Biebl <biebl@debian.org>  Sat, 11 Feb 2012 23:08:07 +0100
+ -- Michael Biebl <biebl@debian.org>  Sat, 11 Feb 2012 23:23:51 +0100
 
 gnome-shell-extensions (3.2.0-1) experimental; urgency=low
 
diff --git a/debian/patches/03-Revert-Remove-all-references-to-localedir-from-metad.patch b/debian/patches/03-Revert-Remove-all-references-to-localedir-from-metad.patch
new file mode 100644
index 00000000..b48d60fd
--- /dev/null
+++ b/debian/patches/03-Revert-Remove-all-references-to-localedir-from-metad.patch
@@ -0,0 +1,302 @@
+From 87b039cc3ee850fb82fbcc4a1a0dadde3db9c0be Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl@debian.org>
+Date: Sat, 11 Feb 2012 23:21:30 +0100
+Subject: [PATCH] Revert "Remove all references to localedir from
+ metadata.json"
+
+This reverts commit c4b40926bd62c4561bdf07ea0f2144494e0f4917.
+
+Conflicts:
+
+	extensions/dock/extension.js
+---
+ extension.mk                                       |    3 ++-
+ extensions/alternate-tab/extension.js              |    2 +-
+ extensions/alternate-tab/metadata.json.in          |    1 +
+ extensions/alternative-status-menu/extension.js    |    3 +--
+ .../alternative-status-menu/metadata.json.in       |    1 +
+ extensions/apps-menu/metadata.json.in              |    1 +
+ extensions/auto-move-windows/metadata.json.in      |    1 +
+ extensions/dock/metadata.json.in                   |    1 +
+ extensions/drive-menu/extension.js                 |    2 +-
+ extensions/drive-menu/metadata.json.in             |    1 +
+ extensions/example/extension.js                    |    2 +-
+ extensions/example/metadata.json.in                |    1 +
+ extensions/gajim/metadata.json.in                  |    1 +
+ .../native-window-placement/metadata.json.in       |    1 +
+ extensions/places-menu/extension.js                |    2 +-
+ extensions/places-menu/metadata.json.in            |    1 +
+ extensions/systemMonitor/metadata.json.in          |    1 +
+ extensions/windowsNavigator/metadata.json.in       |    1 +
+ extensions/workspace-indicator/metadata.json.in    |    1 +
+ extensions/xrandr-indicator/extension.js           |    4 ++--
+ extensions/xrandr-indicator/metadata.json.in       |    1 +
+ 21 files changed, 23 insertions(+), 9 deletions(-)
+
+diff --git a/extension.mk b/extension.mk
+index 220f00c..b16f64f 100644
+--- a/extension.mk
++++ b/extension.mk
+@@ -6,7 +6,8 @@ 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|[@]uuid@|$(uuid)|" \
++	$(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
++	    -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 a53b396..3f35d21 100644
+--- a/extensions/alternate-tab/extension.js
++++ b/extensions/alternate-tab/extension.js
+@@ -594,7 +594,7 @@ WindowList.prototype = {
+ };
+ 
+ function init(metadata) {
+-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
++    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+ }
+ 
+ function doAltTab(shellwm, binding, mask, window, backwards) {
+diff --git a/extensions/alternate-tab/metadata.json.in b/extensions/alternate-tab/metadata.json.in
+index d13c1b8..8aa86e3 100644
+--- a/extensions/alternate-tab/metadata.json.in
++++ b/extensions/alternate-tab/metadata.json.in
+@@ -4,5 +4,6 @@
+ "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 08c2f9e..d13df0f 100644
+--- a/extensions/alternative-status-menu/extension.js
++++ b/extensions/alternative-status-menu/extension.js
+@@ -1,5 +1,4 @@
+ /* -*- mode: js2 - indent-tabs-mode: nil - js2-basic-offset: 4 -*- */
+-const GLib = imports.gi.GLib;
+ const Lang = imports.lang;
+ const St = imports.gi.St;
+ 
+@@ -100,7 +99,7 @@ function createSubMenu() {
+ 
+ // Put your extension initialization code here
+ function init(metadata) {
+-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
++    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+ }
+ 
+ function predestroy(statusMenu) {
+diff --git a/extensions/alternative-status-menu/metadata.json.in b/extensions/alternative-status-menu/metadata.json.in
+index dc3fd7b..91bb82f 100644
+--- a/extensions/alternative-status-menu/metadata.json.in
++++ b/extensions/alternative-status-menu/metadata.json.in
+@@ -3,5 +3,6 @@
+  "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 9f40989..550bb81 100644
+--- a/extensions/apps-menu/metadata.json.in
++++ b/extensions/apps-menu/metadata.json.in
+@@ -3,5 +3,6 @@
+ "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 cf9b433..c8aa632 100644
+--- a/extensions/auto-move-windows/metadata.json.in
++++ b/extensions/auto-move-windows/metadata.json.in
+@@ -3,6 +3,7 @@
+  "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/metadata.json.in b/extensions/dock/metadata.json.in
+index d9dca6c..96237b4 100644
+--- a/extensions/dock/metadata.json.in
++++ b/extensions/dock/metadata.json.in
+@@ -4,5 +4,6 @@
+ "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 bcc44ec..20044ab 100644
+--- a/extensions/drive-menu/extension.js
++++ b/extensions/drive-menu/extension.js
+@@ -92,7 +92,7 @@ DriveMenu.prototype = {
+ 
+ // Put your extension initialization code here
+ function init(metadata) {
+-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
++    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+ }
+ 
+ let _indicator;
+diff --git a/extensions/drive-menu/metadata.json.in b/extensions/drive-menu/metadata.json.in
+index f5a834c..def7c84 100644
+--- a/extensions/drive-menu/metadata.json.in
++++ b/extensions/drive-menu/metadata.json.in
+@@ -3,5 +3,6 @@
+  "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 28274d4..1aec221 100644
+--- a/extensions/example/extension.js
++++ b/extensions/example/extension.js
+@@ -20,7 +20,7 @@ function _showHello() {
+ function init(metadata) {
+     log ('Example extension initalized');
+ 
+-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
++    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+ }
+ 
+ let signalId;
+diff --git a/extensions/example/metadata.json.in b/extensions/example/metadata.json.in
+index 89402dd..239ae01 100644
+--- a/extensions/example/metadata.json.in
++++ b/extensions/example/metadata.json.in
+@@ -3,5 +3,6 @@
+  "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 d7aa644..d258ca4 100644
+--- a/extensions/gajim/metadata.json.in
++++ b/extensions/gajim/metadata.json.in
+@@ -3,5 +3,6 @@
+  "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 798fb0d..d6c7424 100644
+--- a/extensions/native-window-placement/metadata.json.in
++++ b/extensions/native-window-placement/metadata.json.in
+@@ -3,6 +3,7 @@
+  "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 a871a81..17bfe73 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', GLib.build_filenamev([metadata.path, 'locale']));
++    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+ }
+ 
+ let _indicator;
+diff --git a/extensions/places-menu/metadata.json.in b/extensions/places-menu/metadata.json.in
+index 2e483c3..2ea7271 100644
+--- a/extensions/places-menu/metadata.json.in
++++ b/extensions/places-menu/metadata.json.in
+@@ -3,5 +3,6 @@
+ "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 569e9d8..2eb29cc 100644
+--- a/extensions/systemMonitor/metadata.json.in
++++ b/extensions/systemMonitor/metadata.json.in
+@@ -1,6 +1,7 @@
+ {
+     "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 9dd84de..93bdb59 100644
+--- a/extensions/windowsNavigator/metadata.json.in
++++ b/extensions/windowsNavigator/metadata.json.in
+@@ -1,6 +1,7 @@
+ {
+     "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 851b55f..5a331fa 100644
+--- a/extensions/workspace-indicator/metadata.json.in
++++ b/extensions/workspace-indicator/metadata.json.in
+@@ -3,6 +3,7 @@
+     "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 2f846d0..979e549 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', GLib.build_filenamev([metadata.path, 'locale']));
++    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+ }
+ 
+ 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 a1f8526..0da402d 100644
+--- a/extensions/xrandr-indicator/metadata.json.in
++++ b/extensions/xrandr-indicator/metadata.json.in
+@@ -3,5 +3,6 @@
+ "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@"
+ }
+-- 
+1.7.9
+
diff --git a/debian/patches/series b/debian/patches/series
index d2e5bd52..b919cf33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_status-menu_disable_accounts.patch
 02-Revert-all-remove-all-GSettings-usage.patch
+03-Revert-Remove-all-references-to-localedir-from-metad.patch