diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index b4e4eae..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-kBuild-0.1.5-src.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..572f794
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+kBuild-0.1.5-p1-src.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8c8870e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: kBuild
-# $Id$
-NAME := kBuild
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/kBuild-0.1.5-revert2027.patch b/kBuild-0.1.5-revert2027.patch
deleted file mode 100644
index 491f10f..0000000
--- a/kBuild-0.1.5-revert2027.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This reverts commit 2027 which breaks the build.
-
-Index: src/kmk/commands.c
-===================================================================
---- src/kmk/commands.c	(revision 2027)
-+++ src/kmk/commands.c	(revision 2026)
-@@ -656,9 +656,6 @@
- 
-   if (file->precious || file->phony)
-     return;
--#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
--  assert (!file->multi_maybe);
--#endif
- 
- #ifndef NO_ARCHIVES
-   if (ar_name (file->name))
-@@ -713,19 +710,6 @@
-   for (d = child->file->also_make; d != 0; d = d->next)
-     delete_target (d->file, child->file->name);
- 
--#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
--  /* Also remove any multi target siblings, except for the 'maybe' ones (we
--     handle that here) and precious ones (delete_target deals with that).
--     Note that CHILD is always the multi target head (see remake.c).  */
--  if (child->file == child->file->multi_head)
--    {
--      struct file *f2;
--      for (f2 = child->file->multi_next; f2; f2 = f2->multi_next)
--        if (!f2->multi_maybe)
--          delete_target (f2, child->file->name);
--    }
--#endif
--
-   child->deleted = 1;
- }
- 
diff --git a/kBuild.spec b/kBuild.spec
index 5d84034..f6035b4 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,6 +1,8 @@
+%global patchlevel p1
+
 Name:           kBuild
 Version:        0.1.5
-Release:        4%{?dist}
+Release:        5%{?patchlevel:.%{patchlevel}}%{?dist}
 Summary:        A cross-platform build environment
 
 Group:          Development/Tools
@@ -8,7 +10,7 @@ License:        BSD and GPLv2+
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-0.1.5-dprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +29,7 @@ repository.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %patch0 -p1 -b .escape
 %patch1 -p1 -b .dprintf
 
@@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 25 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.1.5-5.p1
+- Update to later patchlevel to support VirtualBox 2.2.0
+
 * Mon Apr 13 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.1.5-4
 - Fix typoes (Robert P. J. Day, #495393)
 - Comment out the colliding dprintf
diff --git a/sources b/sources
index da54911..a075fc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz
+148f821c0f9e729a1f65bc91e69f6e7a  kBuild-0.1.5-p1-src.tar.gz