diff --git a/debian/changelog b/debian/changelog
index 7cd8ad93..7cfb9fad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+gnome-shell-extensions (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 15 Jul 2014 00:06:09 +0200
+
+gnome-shell-extensions (3.12.0-1) experimental; urgency=low
+
+  [ Jean Schurger ]
+  * New upstream release (3.10.1)
+  * debian/rules: remove one of the 'windowsNavigator' extension listed twice
+    and the 'alternative-system-menu' extension (does not exists anymore)
+  * debian/copyright: Update 'Format:' line
+
+  [ Andreas Henriksson ]
+  * New upstream release (3.12.0)
+  * debian/local/gnome-session-classic,
+    debian/patches/gnome-session-classic-wrapper-script.patch:
+    - update script to include new GNOME_SHELL_SESSION_MODE env variable
+      and update patch to apply again.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 04 Apr 2014 21:43:18 +0200
+
 gnome-shell-extensions (3.8.4-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control.in b/debian/control.in
index 882b1e78..fa2ac92d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8.0.0),
                intltool,
                libgnome-desktop-3-dev (>= 3.2.0),
                libgtop2-dev (>= 2.28.3)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: https://wiki.gnome.org/GnomeShell/Extensions
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
diff --git a/debian/copyright b/debian/copyright
index 38822b6e..9dc177e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gnome-shell-extensions
 Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/
diff --git a/debian/local/gnome-session-classic b/debian/local/gnome-session-classic
index d4065e31..11f4dedd 100644
--- a/debian/local/gnome-session-classic
+++ b/debian/local/gnome-session-classic
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec gnome-session --session gnome-classic "$@"
+env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic "$@"
diff --git a/debian/patches/gnome-session-classic-wrapper-script.patch b/debian/patches/gnome-session-classic-wrapper-script.patch
index e6c9ab85..f518ff89 100644
--- a/debian/patches/gnome-session-classic-wrapper-script.patch
+++ b/debian/patches/gnome-session-classic-wrapper-script.patch
@@ -18,7 +18,7 @@ Index: gnome-shell-extensions-3.8.4/data/gnome-classic.desktop.in
  [Desktop Entry]
  _Name=GNOME Classic
  _Comment=This session logs you into GNOME Classic
--Exec=gnome-session --session gnome-classic
+-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 +Exec=gnome-session-classic
  TryExec=gnome-session
  Icon=
diff --git a/debian/rules b/debian/rules
index caba18db..c5b51c20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,8 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\
- alternative-status-menu native-window-placement user-theme\
- apps-menu drive-menu places-menu windowsNavigator systemMonitor\
- launch-new-instance window-list windowsNavigator"
+ native-window-placement user-theme apps-menu drive-menu places-menu\
+ windowsNavigator systemMonitor launch-new-instance window-list"
 
 EXTENSIONS_DISABLED="example xrandr-indicator"