--- /tmp/baselayout-2.1.ebuild	2012-05-16 08:01:37.039593690 +0300
+++ baselayout-2.1.ebuild	2012-05-16 08:19:20.726626774 +0300
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build"
+IUSE="build kernel_linux"
 
 PDEPEND="sys-apps/openrc"
 
@@ -221,4 +221,18 @@
 			ewarn "${bad_shells}"
 		fi
 	fi
+
+	# http://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${ROOT}"/run
+
+		if ! `grep -qs tmpfs.*/run "${ROOT}"/proc/mounts`; then
+			if `grep -qs tmpfs "${ROOT}"/proc/filesystems`; then
+				mount -t tmpfs tmpfs "${ROOT}"/run
+			else
+				ewarn "You need to recompile your kernel with CONFIG_TMPFS=y because it's"
+				ewarn "required for mounting /run."
+			fi
+		fi
+	fi
 }