--- portage/x11-drivers/nvidia-drivers/nvidia-drivers-256.44.ebuild 
+++ local/overlay/portage/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild 
@@ -23,7 +23,8 @@
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.8.99
+#COMMON="<x11-base/xorg-server-1.8.99
+COMMON="x11-base/xorg-server
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-opengl )
 	>=app-admin/eselect-opengl-1.0.9"
@@ -257,6 +258,11 @@
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
+	# For Kernel Linux 2.6.36
+	if use kernel_linux && kernel_is ge 2 6 36; then
+		epatch "${FILESDIR}"/NVIDIA-256.44-2.6.36.patch
+	fi
+
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
 		sed -i \