diff --git a/vhba-module/PKGBUILD b/vhba-module/PKGBUILD
index ac177b418..593527172 100644
--- a/vhba-module/PKGBUILD
+++ b/vhba-module/PKGBUILD
@@ -4,37 +4,25 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=vhba-module
-pkgver=1.2.1
+pkgver=20100822
 _kernver='2.6.37-CHAKRA'
-pkgrel=16
-pkgdesc="Kernel26 module that emulates SCSI devices"
+pkgrel=1
+pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL2')
 depends=('kernel26')
 makedepends=('kernel26-headers')
 install=vhba-module.install
-source=(http://downloads.sourceforge.net/cdemu/vhba-module-$pkgver.tar.bz2 vhba-kernel26-2.6.34.patch vhba-kernel26-2.6.36.patch)
-md5sums=('a3b6ad798f2b72ef599df797ef79e5ec' 'de68d2e744885faade0b03baff52f4a8' '5960ac48a487ff5a4d767ed1f5eaf904')
-groups=("kernel26-modules")
-conflicts=("vhba-module")
-replaces=("vhba-module")
+source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz
+        Make-vhba-compatible-with-kernel-2.6.37-SCSI-host-AP.patch)
+md5sums=('1d2f06ae33c5d15b7c29e467e4658aa2'
+         'f0499fc54f6ef9b8d6ca0b9e940c5906')
 
 build() {
-  cd "$srcdir/vhba-module-$pkgver"
-  #workaround to fix compilation against 2.6.33
-  #http://bugs.gentoo.org/233910
-  for i in kat/*.c; do
-      sed -i "s:<linux/autoconf.h>:<generated/autoconf.h>:" $i
-  done
-
-  patch -Np0 -i ${srcdir}/vhba-kernel26-2.6.34.patch || return 1
-  patch -Np0 -i ${srcdir}/vhba-kernel26-2.6.36.patch || return 1
-
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np2 -i ${srcdir}/Make-vhba-compatible-with-kernel-2.6.37-SCSI-host-AP.patch || return 1
   make -j1 KDIR=/usr/src/linux-${_kernver} || return 1
   install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" || return 1
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install"
diff --git a/vhba-module/vhba-kernel26-2.6.34.patch b/vhba-module/vhba-kernel26-2.6.34.patch
deleted file mode 100644
index 4351ec546..000000000
--- a/vhba-module/vhba-kernel26-2.6.34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** vhba.c~	2010-05-23 02:17:53.000000000 +0200
---- vhba.c	2010-05-23 02:17:53.000000000 +0200
-***************
-*** 26,31 ****
---- 26,32 ----
-  #include <linux/platform_device.h>
-  #include <linux/miscdevice.h>
-  #include <linux/poll.h>
-+ #include <linux/slab.h>
-  #include <asm/uaccess.h>
-  #include <scsi/scsi.h>
-  #include <scsi/scsi_host.h>
diff --git a/vhba-module/vhba-kernel26-2.6.36.patch b/vhba-module/vhba-kernel26-2.6.36.patch
deleted file mode 100644
index 21da2c576..000000000
--- a/vhba-module/vhba-kernel26-2.6.36.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vhba.c.orig	2010-10-22 23:16:21.896084497 +0200
-+++ vhba.c	2010-10-22 23:17:38.150243713 +0200
-@@ -672,7 +672,7 @@ static ssize_t vhba_ctl_write(struct fil
-         return ret;
- }
- 
--static int vhba_ctl_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-+static long vhba_ctl_unlocked_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
- {
-         struct vhba_device *vdev = file->private_data;
-         struct vhba_host *vhost;
-@@ -782,7 +782,7 @@ static struct file_operations vhba_ctl_f
-         .read = vhba_ctl_read,
-         .write = vhba_ctl_write,
-         .poll = vhba_ctl_poll,
--        .ioctl = vhba_ctl_ioctl,
-+        .unlocked_ioctl = vhba_ctl_unlocked_ioctl,
- };
- 
- static struct miscdevice vhba_miscdev = {