diff --git a/gnome b/gnome
index 0fb9356..e90daa7 100644
--- a/gnome
+++ b/gnome
@@ -88,4 +88,9 @@ fi
 # Uncomment after SLED12, remove after SLED14:
 #rm -f ~/.skel/gnome2-run ~/.skel/gnome2-run-9.2 ~/.skel/sled10-run
 
-exec /usr/bin/gnome-session $*
+# in case we want to start gnome-classic, we need to inject --session into the cmd line.
+if [ "$1" == "gnome-classic" ]; then
+	session="--session"
+fi
+
+exec /usr/bin/gnome-session ${session} $*
diff --git a/gnome-session-3.8.0.tar.xz b/gnome-session-3.8.0.tar.xz
deleted file mode 100644
index 5cd1b1a..0000000
--- a/gnome-session-3.8.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7892c4ef5049bf5f4ac75bc82b554c1c5f962249108c8467df1be0f947b5a99f
-size 768856
diff --git a/gnome-session-3.8.1.tar.xz b/gnome-session-3.8.1.tar.xz
new file mode 100644
index 0000000..b03b5ae
--- /dev/null
+++ b/gnome-session-3.8.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770
+size 771568
diff --git a/gnome-session.changes b/gnome-session.changes
index 998171c..9da2391 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Apr 15 20:23:55 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.8.1:
+  + Check for logind, not systemd (bgo#696262).
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Apr 13 15:44:32 UTC 2013 - dimstar@opensuse.org
+
+- Modify gnome starter script: if the first parameter is
+  'gnome-classic', that means we want to start gnome-session with
+  --session gnome-classic (we need to inject --session into the
+  build command).
+
+-------------------------------------------------------------------
+Tue Apr  2 19:12:20 UTC 2013 - dimstar@opensuse.org
+
+- Drop gnome2-look-and-feel package and obsolete it from the main
+  package. The replacement is called gnome-shell-classic and is
+  built by gnome-shell-extensions.
+
 -------------------------------------------------------------------
 Tue Mar 26 09:34:33 UTC 2013 - dimstar@opensuse.org
 
diff --git a/gnome-session.spec b/gnome-session.spec
index 01b4738..5733e2a 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -19,7 +19,7 @@
 %define with_systemd 1
 
 Name:           gnome-session
-Version:        3.8.0
+Version:        3.8.1
 Release:        0
 Summary:        Session Tools for the GNOME Desktop
 License:        GPL-2.0+
@@ -73,6 +73,8 @@ Obsoletes:      gnome-session-gtk1-support <= 2.31
 Obsoletes:      gnome-session-splash <= 2.31
 # the fallback session was dropped in gnome 3.8.
 Obsoletes:      gnome-session-fallback-session < 3.8
+# Since GNOME 3.8.0, the 'classic' mode is provided by gnome-shell-extensions.
+Obsoletes:      gnome2-look-and-feel <= 3.8.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -89,15 +91,6 @@ Requires:       gnome-shell
 %description default-session
 This package contains the definition of the default GNOME session.
 
-%package -n gnome2-look-and-feel
-Summary:        GNOME Desktop with the GNOME 2 Look and Feel
-Group:          System/GUI/GNOME
-# TO BE DEFINED.. shoult require the correct classic extensions to make this up
-
-%description -n gnome2-look-and-feel
-This package contains the definition to choose in the display manager
-a GNOME 3 session that looks and feels like GNOME 2.
-
 %package core
 Summary:        Session Manager for GNOME -- Minimal Version
 Group:          System/GUI/GNOME
@@ -140,12 +133,8 @@ install -d -m755 %{buildroot}%{_bindir}
 install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome
 install -d -m755 %{buildroot}%{_datadir}/xsessions
 install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop
-# Install a session file for gnome 2 look-and-feel (gnome3 with classic look and feel extensions)
-install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/gnome2-look-and-feel.desktop
-# FIXME: gnome2-look-and-feel.desktop needs to be corrected to know how to statr classic mode.
 %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
-%suse_update_desktop_file -N "GNOME 2 Look and Feel" %{buildroot}%{_datadir}/xsessions/gnome2-look-and-feel.desktop
 %find_lang %{name}-3.0 %{?no_lang_C}
 %fdupes %{buildroot}
 
@@ -184,10 +173,6 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-session/sessions/gnome.session
 %{_datadir}/gnome-session/sessions/gnome-dummy.session
 
-%files -n gnome2-look-and-feel
-%defattr(-, root, root)
-%{_datadir}/xsessions/gnome2-look-and-feel.desktop
-
 %files core
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README