diff --git a/Makefile.defs b/Makefile.defs
index 38c9efd..164971c 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -13,10 +13,13 @@ _initsystem = sysvinit
 /sbin/shutdown = $(_initsystem)
 /sbin/telinit = $(_initsystem)
 
+#xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia
+
 ifeq ($(ARCH),i586)
 # kernel
 kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
 kernelsound = kernel-$(KERNEL_EXTRAVER)-sound
+kernelheaders = kernel-$(KERNEL_EXTRAVER)-headers
 # FIXME: r8101 is a ethernet driver but virtual requirement is called kernelwireless
 kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-r8101
 kernelsound-$(KERNEL_EXTRAVER) = kernel-$(KERNEL_EXTRAVER)-sound
@@ -41,6 +44,7 @@ ifdef KERNEL_MORE_EXTRAVER
 kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia
 # kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
 kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound
+kernelheaders += kernel-$(KERNEL_MORE_EXTRAVER)-headers
 kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-r8101
 kernelsound-$(KERNEL_MORE_EXTRAVER) += kernel-$(KERNEL_MORE_EXTRAVER)-sound
 kernelwireless-$(KERNEL_MORE_EXTRAVER) += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-r8101
@@ -72,33 +76,33 @@ endif
 
 ifeq ($(ARCH),i586)
 # xorg
-xorglibGL = libGL-Mesa-dri libGL-fglrx-X11 libGL-nvidia-X11
-# libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11
-xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
-# xorg-ext-libglx-nvidia_71xx xorg-ext-libglx-nvidia_96xx xorg-ext-libglx-nvidia_173xx
+xorglibGL = libGL-Mesa-dri
+# libGL-fglrx-X11 libGL-nvidia-X11
+xorglibglx = xorg-ext-libglx
+# xorg-ext-libglx-nvidia
 libGLcore.so.1 = xorg-drv-video-nvidia
 # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
 libnvidia-tls.so.1 = xorg-drv-video-nvidia
 libvdpau.so.1 = libvdpau
 libvdpau_trace.so.1 = libvdpau
-xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau
+xorgdrvvideo = xorg-drv-video-base xorg-drv-video-nouveau $(xorgproprietary)
 # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
 bootloader = syslinux
 endif
 
 ifeq ($(ARCH),x86_64)
 # xorg
-xorglibGL = libGL-Mesa-dri libGL-nvidia-X11
-# libGL-fglrx-X11
-xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
+xorglibGL = libGL-Mesa-dri
+# libGL-nvidia-X11 libGL-fglrx-X11
+xorglibglx = xorg-ext-libglx
+# xorg-ext-libglx-nvidia
 libGLcore.so.1 = xorg-drv-video-nvidia
 libnvidia-tls.so.1 = xorg-drv-video-nvidia
 libvdpau.so.1[][64bit] = libvdpau
 libvdpau_trace.so.1[][64bit] = libvdpau
 xorgdrvvideo = xorg-drv-video-ati xorg-drv-video-dummy xorg-drv-video-fbdev xorg-drv-video-i128 xorg-drv-video-intel \
-               xorg-drv-video-mga xorg-drv-video-nvidia xorg-drv-video-nouveau xorg-drv-video-openchrome \
-               xorg-drv-video-r128 xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware
-# xorg-drv-video-fglrx
+               xorg-drv-video-mga xorg-drv-video-nouveau xorg-drv-video-openchrome \
+               xorg-drv-video-r128 xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware $(xorgproprietary)
 bootloader = syslinux
 endif