diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b4e4eae
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+kBuild-0.1.5-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.3-escape.patch b/kBuild-0.1.3-escape.patch
new file mode 100644
index 0000000..5a708aa
--- /dev/null
+++ b/kBuild-0.1.3-escape.patch
@@ -0,0 +1,17 @@
+This is so that we can pass the command argument with spaces.
+Note that this is not really portable, $@ is a bashism, and
+traditional shell does not have a suitable replacement.
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+--- kBuild-0.1.3/kBuild/env.sh.escape	2008-08-17 21:13:20.000000000 +0200
++++ kBuild-0.1.3/kBuild/env.sh	2008-08-17 21:13:23.000000000 +0200
+@@ -568,7 +568,7 @@
+             MY_RC=$?
+         else
+             test -z "${QUIET_OPT}" && echo "$0: info: Executing command: $*" 1>&${ERR_REDIR}
+-            $*
++            "$@"
+             MY_RC=$?
+             test -z "${QUIET_OPT}" -a "$MY_RC" -ne 0 && echo "$0: info: rc=$MY_RC: $*" 1>&${ERR_REDIR}
+         fi
diff --git a/kBuild.spec b/kBuild.spec
new file mode 100644
index 0000000..18d3080
--- /dev/null
+++ b/kBuild.spec
@@ -0,0 +1,103 @@
+Name:           kBuild
+Version:        0.1.5
+Release:        1%{?dist}
+Summary:        A cross-platform build enviroment
+
+Group:          Development/Tools
+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
+Patch0:         kBuild-0.1.3-escape.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  byacc libacl-devel flex 
+BuildRequires:  autoconf automake gettext-devel
+
+
+%description
+This is a GNU make fork that with a set of scripts to simplify
+complex tasks and portable versions of various UNIX tools to
+ensure cross-platform portability.
+
+It is used mainly to build VirtualBox OSE packages for RPM Fusion
+repository.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .escape
+
+# Remove prebuilt stuff
+rm -rf kBuild/bin/*
+
+
+%build
+%define bootstrap_mflags %{_smp_mflags} \\\
+        CFLAGS="%{optflags}"            \\\
+        KBUILD_VERBOSE=2
+
+%define mflags %{bootstrap_mflags}      \\\
+        NIX_INSTALL_DIR=%{_prefix}      \\\
+        BUILD_TYPE=release              \\\
+        MY_INST_MODE=0644               \\\
+        MY_INST_BIN_MODE=0755
+
+# The bootstrap would probably not be needed if we depended on ourselves,
+# yet it is not guarranteed that new versions are compilable with older
+# kmk versions, so with this we are on a safer side
+kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
+
+kBuild/env.sh kmk %{mflags} rebuild
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+export KBUILD_VERBOSE=2
+kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install
+# These are included later in files section
+rm -r $RPM_BUILD_ROOT%{_docdir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_datadir}/*
+%doc COPYING ChangeLog
+%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
+
+
+%changelog
+* Sat Jan 24 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.1.5-1
+- Update to new upstream release
+
+* Tue Dec 30 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.1.5-0.1.20081106svn
+- Update to build VirtualBox OSE 2.1.0
+
+* Fri Sep 19 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.1.4-1
+- New upstream release
+
+* Thu Aug 28 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.1.3-2
+- Add gettext-devel to BRs for autopoint
+
+* Sun Aug 17 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.1.3-1
+- New upstream version
+- Install into FHS hierarchy
+- Honour optflags
+- No need to be arch specific
+
+* Tue Oct 30 2007 Till Maas <opensource till name> - 0.1.0-0.3.20070627svn
+- add support for x86_64
+- add BR: autoconf, automake
+
+* Wed Jun 27 2007 Till Maas <opensource till name> - 0.1.0-0.2.20070627svn
+- Update to a new version
+- just copy the bin files to %%{_libexecdir}, kmk install does not work
+
+* Sun Feb 18 2007 Till Maas <opensource till name> - 0.1.0-0.1.20070218svn
+- Initial spec for fedora extras
diff --git a/sources b/sources
index e69de29..da54911 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz