diff --git a/nvidia-173xx-lts/PKGBUILD b/nvidia-173xx-lts/PKGBUILD
index 9b06b813e..cb3ebb42d 100644
--- a/nvidia-173xx-lts/PKGBUILD
+++ b/nvidia-173xx-lts/PKGBUILD
@@ -8,21 +8,21 @@
 _kernver="2.6.35-CHAKRA-LTS"
 
 pkgname=nvidia-173xx-lts
-pkgver=173.14.30
+pkgver=173.14.31
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
-depends=('kernel26' 'nvidia-173xx-utils')
-makedepends=('kernel26-headers')
+depends=('kernel26-lts' 'nvidia-173xx-utils')
+makedepends=('kernel26-lts-headers')
 conflicts=('nvidia-96xx' 'nvidia' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
-md5sums=('665f9f730c18ab24a997e0e14b863262')
-[ "$CARCH" = "x86_64" ] && md5sums=('8c47463ae14a2f742d0fa00160456745')
+md5sums=('01cd3b91196cd4495f56c34494f310b5')
+[ "$CARCH" = "x86_64" ] && md5sums=('d53e8faf8ac90ad98b8998f25f121535')
 
 build() {
         cd $srcdir
diff --git a/nvidia-173xx-utils/PKGBUILD b/nvidia-173xx-utils/PKGBUILD
index 24b7bde4f..9829f6c1b 100644
--- a/nvidia-173xx-utils/PKGBUILD
+++ b/nvidia-173xx-utils/PKGBUILD
@@ -8,8 +8,8 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=nvidia-173xx-utils
-pkgver=173.14.30
-pkgrel=2
+pkgver=173.14.31
+pkgrel=1
 pkgdesc="NVIDIA drivers utilities and libraries, 173xx branch."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86 	 
@@ -22,8 +22,8 @@ license=('custom')
 install=nvidia.install
 options=(!strip)
 source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run")
-md5sums=('665f9f730c18ab24a997e0e14b863262')
-[ "$CARCH" = "x86_64" ] && md5sums=('8c47463ae14a2f742d0fa00160456745')
+md5sums=('01cd3b91196cd4495f56c34494f310b5')
+[ "$CARCH" = "x86_64" ] && md5sums=('d53e8faf8ac90ad98b8998f25f121535')
 
 source[1]='20-nvidia.conf'
 md5sums[1]='37e417b2c69e46de1346a653e07027fa'
diff --git a/nvidia-173xx-utils/nvidia.install b/nvidia-173xx-utils/nvidia.install
index e90ac5d96..42424998c 100644
--- a/nvidia-173xx-utils/nvidia.install
+++ b/nvidia-173xx-utils/nvidia.install
@@ -1,4 +1,4 @@
-VERSION='173.14.30'
+VERSION='173.14.31'
 
 whisperer(){
 	echo 'By using this package you accept the NVIDIA license,'
diff --git a/nvidia-173xx/PKGBUILD b/nvidia-173xx/PKGBUILD
index 76098b123..69c407d73 100644
--- a/nvidia-173xx/PKGBUILD
+++ b/nvidia-173xx/PKGBUILD
@@ -7,8 +7,8 @@
 _kernver=`pacman -Q kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
 
 pkgname=nvidia-173xx
-pkgver=173.14.30
-pkgrel=2
+pkgver=173.14.31
+pkgrel=1
 # Find the kernel name inside the chroot
 
 pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
@@ -22,8 +22,8 @@ conflicts=('nvidia-96xx' 'nvidia' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
-md5sums=('665f9f730c18ab24a997e0e14b863262')
-[ "$CARCH" = "x86_64" ] && md5sums=('8c47463ae14a2f742d0fa00160456745')
+md5sums=('01cd3b91196cd4495f56c34494f310b5')
+[ "$CARCH" = "x86_64" ] && md5sums=('d53e8faf8ac90ad98b8998f25f121535')
 
 build() {
         cd $srcdir
diff --git a/nvidia-96xx-lts/PKGBUILD b/nvidia-96xx-lts/PKGBUILD
index 753b7f9fd..337cb042a 100644
--- a/nvidia-96xx-lts/PKGBUILD
+++ b/nvidia-96xx-lts/PKGBUILD
@@ -11,7 +11,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 _kernver="2.6.35-CHAKRA-LTS"
 
 pkgname=nvidia-96xx-lts
-pkgver=96.43.19
+pkgver=96.43.20
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26, 96xx branch."
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ conflicts=('nvidia-lts' 'nvidia-173xx-lts')
 license=('custom')
 install=nvidia.install
 source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
-md5sums=('53e98129d885a1b004aabc42a989fa73')
+md5sums=('875cc011385ea26ab5edd54a9b65a003')
 [ "$CARCH" = "x86_64" ] && md5sums=('7ff779e299b938b880baff6cd970ab51')
 
 build() {
diff --git a/nvidia-96xx-utils/PKGBUILD b/nvidia-96xx-utils/PKGBUILD
index 4f18c998b..ac1a41627 100644
--- a/nvidia-96xx-utils/PKGBUILD
+++ b/nvidia-96xx-utils/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-96xx-utils
-pkgver=96.43.19
+pkgver=96.43.20
 pkgrel=1
 pkgdesc="NVIDIA drivers utilities and libraries, 96xx branch."
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ license=('custom')
 install=nvidia.install
 options=(!strip)
 source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run")
-md5sums=('53e98129d885a1b004aabc42a989fa73')
+md5sums=('875cc011385ea26ab5edd54a9b65a003')
 [ "$CARCH" = "x86_64" ] && md5sums=('7ff779e299b938b880baff6cd970ab51')
 
 build() {
diff --git a/nvidia-96xx/PKGBUILD b/nvidia-96xx/PKGBUILD
index c729deebc..0e6f000b4 100644
--- a/nvidia-96xx/PKGBUILD
+++ b/nvidia-96xx/PKGBUILD
@@ -8,12 +8,12 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=nvidia-96xx
-pkgver=96.43.19
+pkgver=96.43.20
 
 # Find the kernel name inside the chroot
-_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
+_kernver=`pacman -Q kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
 
-pkgrel=4
+pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26, 96xx branch."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
@@ -25,7 +25,7 @@ conflicts=('nvidia' 'nvidia-173xx' 'nvidia-96xx')
 license=('custom')
 install=nvidia.install
 source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
-md5sums=('53e98129d885a1b004aabc42a989fa73')
+md5sums=('875cc011385ea26ab5edd54a9b65a003')
 [ "$CARCH" = "x86_64" ] && md5sums=('7ff779e299b938b880baff6cd970ab51')
 
 build() {
diff --git a/nvidia-96xx/nvidia.install b/nvidia-96xx/nvidia.install
index b2d62b867..5180f9093 100644
--- a/nvidia-96xx/nvidia.install
+++ b/nvidia-96xx/nvidia.install
@@ -1,5 +1,5 @@
 post_install() {
-	KERNEL_VERSION='2.6.38-CHAKRA'
+	KERNEL_VERSION='2.6.39-CHAKRA'
 	depmod $KERNEL_VERSION
 }
 
@@ -9,6 +9,6 @@ post_upgrade() {
 }
 
 post_remove() {
-	KERNEL_VERSION='2.6.38-CHAKRA'
+	KERNEL_VERSION='2.6.39-CHAKRA'
 	depmod $KERNEL_VERSION
 }
diff --git a/xf86-video-nouveau/PKGBUILD b/xf86-video-nouveau/PKGBUILD
index 24a3a975e..4d4d7378c 100644
--- a/xf86-video-nouveau/PKGBUILD
+++ b/xf86-video-nouveau/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=xf86-video-nouveau
 _gitdate=20110710
 pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/wiki/"
@@ -16,7 +16,6 @@ depends=('libdrm' 'udev' 'libgl')
 optdepends=('nouveau-dri:	experimental gallium3d features')
 makedepends=('xorg-server' 'libdrm>=2.4.24' 'xf86driproto')
 conflicts=('xorg-server<1.10.1')
-replaces=('nvidia-96xx' 'nvidia-96xx-utils')
 options=('!libtool') # 'force')
 install=${pkgname}.install
 source=(http://chakra-project.org/sources/xf86-video-nouveau/xf86-video-nouveau-${_gitdate}.tar.bz2)
diff --git a/xf86-video-nouveau/xf86-video-nouveau.install b/xf86-video-nouveau/xf86-video-nouveau.install
index dd9101adf..3c86cb39d 100644
--- a/xf86-video-nouveau/xf86-video-nouveau.install
+++ b/xf86-video-nouveau/xf86-video-nouveau.install
@@ -2,7 +2,6 @@ post_install () {
    cat << _EOF
   ==> make sure you use KernelModeSetting (KMS)
   ==> see http://www.chakra-project.org/wiki/index.php/Nouveau#KMS for more
-  ==> This driver replaces nvidia-96xx. Please change your driver to nouveau in your xorg.conf
 _EOF
 }