diff --git a/ndiswrapper-utils/PKGBUILD b/ndiswrapper-utils/PKGBUILD
deleted file mode 100644
index 17126fb56..000000000
--- a/ndiswrapper-utils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-#$Id: PKGBUILD 77959 2010-04-19 07:17:40Z allan $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=ndiswrapper-utils
-pkgver=1.56
-pkgrel=2
-pkgdesc="Binaries for ndiswrapper module"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://ndiswrapper.sourceforge.net"
-depends=('wireless_tools' 'glibc' 'perl')
-replaces=('ndiswrapper-bin')
-conflicts=('ndiswrapper-bin')
-source=(http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-$pkgver.tar.gz)
-md5sums=('1431f7ed5f8e92e752d330bbb3aed333')
-
-build()
-{
-  cd $srcdir/ndiswrapper-$pkgver/utils
-  make || return 1
-}
-
-package() {
-  cd $srcdir/ndiswrapper-$pkgver/utils
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/ndiswrapper/PKGBUILD b/ndiswrapper/PKGBUILD
index a3acf68fb..0f75f6283 100644
--- a/ndiswrapper/PKGBUILD
+++ b/ndiswrapper/PKGBUILD
@@ -7,43 +7,38 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname=ndiswrapper
-pkgver=1.56
-pkgrel=16
-
 # Find the kernel name inside the chroot
-_kernver=`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA
+_extramodules=extramodules-`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA
+_kver="$(cat /lib/modules/${_extramodules}/version)"
 
+pkgname=ndiswrapper
+pkgver=1.57
+pkgrel=4
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
 license=('GPL')
-groups=('linux-modules')
 arch=(i686 x86_64)
 url="http://ndiswrapper.sourceforge.net"
 install="ndiswrapper.install"
-depends=("ndiswrapper-utils=$pkgver" 'linux>=3.0' 'linux<3.1')
+depends=('linux>=3.2' 'linux<3.3')
+provides=("ndiswrapper-utils=$pkgver")
+replaces=('ndiswrapper-utils')
+conflicts=('ndiswrapper-utils')
 makedepends=('linux-headers')
-source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz
-        kernel-2.6.35.patch
-        kernel-2.6.36.patch
-        kernel-2.6.38.patch)
-build()
-{
-  cd $srcdir/ndiswrapper-$pkgver/driver
-  patch -Np2 -i $startdir/kernel-2.6.35.patch
-  patch -Np2 -i $startdir/kernel-2.6.36.patch
-  patch -Np2 -i $startdir/kernel-2.6.38.patch
-  make KVERS=$_kernver
-  make DESTDIR=$pkgdir KVERS=$_kernver install
-  rm $pkgdir/lib/modules/$_kernver/modules.* #wtf?
+source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz)
+md5sums=('7a401dc540938bf07893c67f418b6152')
 
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-  # move it to correct kernel directory
-  mkdir -p $pkgdir/lib/modules/$_kernver/kernel/drivers/net/wireless/ndiswrapper
-  mv $pkgdir/lib/modules/$_kernver/misc/* $pkgdir/lib/modules/$_kernver/kernel/drivers/net/wireless/ndiswrapper/
-  rm -r $pkgdir/lib/modules/$_kernver/misc/
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make KVERS=$_kver
 }
 
-md5sums=('1431f7ed5f8e92e752d330bbb3aed333'
-         '0a03d613b1fd545a75c5dd1a7c2aaec4'
-         'cc16ed13449f17e90865df688b180b2c'
-         '2499a87276ae0c8ce39bea6ef942d926')
\ No newline at end of file
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make INST_DIR="lib/modules/$_extramodules" \
+    KVERS=$_kver DESTDIR="$pkgdir/" install
+
+  gzip "$pkgdir/lib/modules/$_extramodules/$pkgname.ko"
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/*.install
+}
\ No newline at end of file
diff --git a/ndiswrapper/ndiswrapper.install b/ndiswrapper/ndiswrapper.install
index 4c6911453..3bbd480fa 100644
--- a/ndiswrapper/ndiswrapper.install
+++ b/ndiswrapper/ndiswrapper.install
@@ -1,23 +1,15 @@
-# arg 1:  the new package version
 post_install()
 {
-  ndiswrapper -m
-  KERNEL_VERSION='3.0-CHAKRA'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1 
+  post_upgrade
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade()
 {
-  ndiswrapper -m
-  KERNEL_VERSION='3.0-CHAKRA'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1 
+  EXTRAMODULES='extramodules-3.2-CHAKRA'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
-# arg 1:  the old package version
 post_remove()
 {
-  KERNEL_VERSION='3.0-CHAKRA'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1
+  post_upgrade
 }