diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
new file mode 100644
index 000000000..4ef0ee983
--- /dev/null
+++ b/gnome-base/gnome-session/Manifest
@@ -0,0 +1,7 @@
+AUX Gnome 2457 RMD160 71b084bf46db8f1551b21b843e5ee12015bc836e SHA1 7b6f633d6000554977f69869aae2b817166f59a2 SHA256 347b9e364607b25637205c3984a3662518395ca2e200578e6b976a6c73ad63a7
+AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc94534491f6c0a0c772265268386c SHA1 c17b429a1d0b1d7f043ae1d6c88ab4f7894c983d SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5
+DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
+DIST gnome-session-2.26.1-gentoo-patches.tar.bz2 6060 RMD160 acbb15102d5e2c6a17e9cd69450085bf233caf69 SHA1 aceab28c15bfe9cb18c93cc2d4fd0a7213374f1a SHA256 9189f35565a6e0b2b6a218e3eee47db0c40cff091172ab25220df9a9ee5020a8
+DIST gnome-session-2.26.1.tar.bz2 835266 RMD160 d4eb6a0fc639a257645b2e4138055d9e1bd9f9a6 SHA1 3c8dc68f197c6b5a7d30e3ce04e65954bfe12070 SHA256 35e304ec42ed69a2b98377fd7cfac19fa00ca53bb5d6307094ebf077c00dbc32
+EBUILD gnome-session-2.26.1-r1.ebuild 2338 RMD160 77f35aa43c361b25901d51fb7803c805016d4251 SHA1 55ec6b6154bd3057074810250700ed7851cea844 SHA256 51afce313cfa640ead4bc52e38f7479bff140bcdf37075911c91466c64142972
+MISC metadata.xml 269 RMD160 6bbdafdb02cf28eb4f772d7e330519eb07ab4dcb SHA1 18a2628db0509bf3ccd54f626f3bdd4b7c3a7a43 SHA256 a735ba6a51fe0c18552eda7327e431b231fd7b590a82ba9f1cc32b0c1a38e50e
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
new file mode 100644
index 000000000..98fe26d86
--- /dev/null
+++ b/gnome-base/gnome-session/files/Gnome
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Great new Gnome2 feature, AA
+# We enable this by default
+
+export GDK_USE_XFT=1
+
+for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+#
+#  Distributors:
+#  You should modify the paths here to fit your distro
+#  If you need to do so, send me (jirka@5z.com) a patch
+#  and I'll try to make the script detect the distro stuff
+#
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+if [ -x "$HOME/.gnomerc" ]; then
+	command="$HOME/.gnomerc"
+elif [ -x /etc/X11/gdm/gnomerc ]; then
+	command="/etc/X11/gdm/gnomerc"
+else
+	# as fallback in case the config is screwed
+	command=`which gnome-session`
+fi
+
+sshagent=`which ssh-agent`
+if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+    command="$sshagent -- $command"
+fi
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec $command
diff --git a/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch b/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch
new file mode 100644
index 000000000..37c41303c
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch
@@ -0,0 +1,11 @@
+--- data/gnome-session.schemas.in	2007-01-24 15:12:52.000000000 -0600
++++ data/gnome-session.schemas.in	2007-01-24 15:13:10.000000000 -0600
+@@ -50,7 +50,7 @@
+          <applyto>/apps/gnome-session/options/splash_image</applyto>
+          <owner>gnome</owner>
+          <type>string</type>
+-         <default>splash/gnome-splash.png</default>
++         <default>splash/gentoo-splash.png</default>
+          <locale name="C">
+             <short>Preferred Image to use for login splash screen</short>
+             <long>This is a relative path value based off the $datadir/pixmaps/ directory.  Sub-directories and image names are valid values. Changing this value will effect the next session login.</long>
diff --git a/gnome-base/gnome-session/gnome-session-2.26.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.26.1-r1.ebuild
new file mode 100644
index 000000000..2a0908dbd
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.26.1-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.26.1.ebuild,v 1.2 2009/05/14 05:39:31 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils fdo-mime gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-gentoo-patches.tar.bz2
+	branding? ( mirror://gentoo/gentoo-splash.png )"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="branding doc ipv6 policykit"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.11.1
+	>=gnome-base/libglade-2.3.6
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.9
+	policykit? ( >=gnome-extra/policykit-gnome-0.7 )
+
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-apps/xdpyinfo"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )"
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF}
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)
+		$(use_enable policykit polkit)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Patch for Gentoo Branding (bug #42687)
+	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+	# Fix shutdown/restart capability, upstream bug #549150
+	epatch "${WORKDIR}/${PN}-2.26.1-shutdown.patch"
+
+	# Add "session saving" button back, upstream bug #575544
+	epatch "${WORKDIR}/${PN}-2.26.1-session-saving-button.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome" || die "doexe failed"
+
+	# Our own splash for world domination
+	if use branding ; then
+		insinto /usr/share/pixmaps/splash/
+		doins "${DISTDIR}/gentoo-splash.png" || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+        fdo-mime_mime_database_update
+        fdo-mime_desktop_database_update
+        gnome2_gconf_savelist
+        gnome2_gconf_install
+        if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
+                gnome2_scrollkeeper_update
+        fi
+}
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
new file mode 100644
index 000000000..fa475007e
--- /dev/null
+++ b/gnome-base/gnome-session/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<use>
+		<flag name="policykit">Enable <pkg>sys-auth/policykit</pkg>
+			authentication support</flag>
+	</use>
+</pkgmetadata>