diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f882dc5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: aboot
-# $Id$
-NAME := aboot
-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/aboot-1.0_pre20040408-elf_h.patch b/aboot-1.0_pre20040408-elf_h.patch
new file mode 100644
index 0000000..ad71e45
--- /dev/null
+++ b/aboot-1.0_pre20040408-elf_h.patch
@@ -0,0 +1,48 @@
+diff -up aboot-1.0_pre20040408/disk.c.elf_h aboot-1.0_pre20040408/disk.c
+--- aboot-1.0_pre20040408/disk.c.elf_h	2009-02-11 10:00:58.000000000 +0100
++++ aboot-1.0_pre20040408/disk.c	2009-02-11 10:00:58.000000000 +0100
+@@ -36,7 +36,6 @@
+ #include <linux/elf.h>
+ #include <asm/console.h>
+ #include "system.h"
+-#include <asm/elf.h>
+ 
+ extern struct bootfs ext2fs;
+ extern struct bootfs iso;
+diff -up aboot-1.0_pre20040408/Makefile.elf_h aboot-1.0_pre20040408/Makefile
+--- aboot-1.0_pre20040408/Makefile.elf_h	2009-02-11 10:02:30.000000000 +0100
++++ aboot-1.0_pre20040408/Makefile	2009-02-11 10:02:42.000000000 +0100
+@@ -18,7 +18,7 @@ VMLINUXGZ	= $(KSRC)/arch/alpha/boot/vmli
+ 
+ # for boot testing
+ #CFGDEFS       	= -DDEBUG_ISO -DDEBUG_ROCK -DDEBUG_EXT2 -DDEBUG
+-CFGDEFS = $(OPTFLAGS)
++CFGDEFS = $(OPTFLAGS) -I$(KSRC)
+ 
+ # root, aka prefix
+ root		=
+diff -up aboot-1.0_pre20040408/tools/elfencap.c.elf_h aboot-1.0_pre20040408/tools/elfencap.c
+--- aboot-1.0_pre20040408/tools/elfencap.c.elf_h	2001-10-09 01:03:53.000000000 +0200
++++ aboot-1.0_pre20040408/tools/elfencap.c	2009-02-11 10:00:58.000000000 +0100
+@@ -6,6 +6,7 @@
+ #include <sys/stat.h>
+ 
+ #include <linux/elf.h>
++#include <include/asm-alpha/elf.h>
+ 
+ 
+ int
+diff -up aboot-1.0_pre20040408/tools/objstrip.c.elf_h aboot-1.0_pre20040408/tools/objstrip.c
+--- aboot-1.0_pre20040408/tools/objstrip.c.elf_h	2003-01-14 21:24:29.000000000 +0100
++++ aboot-1.0_pre20040408/tools/objstrip.c	2009-02-11 10:00:58.000000000 +0100
+@@ -27,9 +27,9 @@
+ #include <string.h>
+ 
+ #ifdef __ELF__
+-# include <asm/elf.h>
+ # include <linux/elf.h>
+ # include <linux/version.h>
++# include <include/asm-alpha/elf.h>
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ #  define aboot_elf_check_arch(e)        elf_check_arch(e)
+ # else
diff --git a/aboot-1.0_pre20040408-page_h.patch b/aboot-1.0_pre20040408-page_h.patch
new file mode 100644
index 0000000..983babf
--- /dev/null
+++ b/aboot-1.0_pre20040408-page_h.patch
@@ -0,0 +1,12 @@
+diff -up aboot-1.0_pre20040408/zip/misc.c.page_h aboot-1.0_pre20040408/zip/misc.c
+--- aboot-1.0_pre20040408/zip/misc.c.page_h	2009-02-11 06:33:50.000000000 +0100
++++ aboot-1.0_pre20040408/zip/misc.c	2009-02-11 06:34:00.000000000 +0100
+@@ -11,8 +11,6 @@
+  */
+ #include <linux/kernel.h>
+ 
+-#include <asm/page.h>
+-
+ #include "aboot.h"
+ #include "bootfs.h"
+ #include "setjmp.h"
diff --git a/aboot.spec b/aboot.spec
index 29b207f..d58000f 100644
--- a/aboot.spec
+++ b/aboot.spec
@@ -2,8 +2,8 @@
 Summary:		A bootloader which can be started from the SRM console
 Name:			aboot
 Version:		1.0
-Release:		0.1.%{prever}%{?dist}
-ExclusiveArch:	alpha
+Release:		0.2.%{prever}%{?dist}
+ExclusiveArch:		alpha
 License:		GPLv2+
 Group:			System Environment/Base
 URL:			http://www.sf.net/projects/aboot
@@ -11,6 +11,8 @@ Source0:		http://aboot.sourceforge.net/tarballs/aboot-%{version}_%{prever}.tar.b
 Patch0:			aboot_1.0~%{prever}-2.diff.gz
 Patch1:			aboot-1.0.doc_install_fix.patch
 Patch2:			aboot-optflags.patch
+Patch3:			aboot-1.0_pre20040408-page_h.patch
+Patch4:			aboot-1.0_pre20040408-elf_h.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	kernel-devel, docbook-utils
 
@@ -33,6 +35,8 @@ install the aboot package.
 %patch0 -p1
 %patch1 -p1 -b .doc_install_fix
 %patch2 -p1 -b .optflags
+%patch3 -p1 -b .page_h
+%patch4 -p1 -b .elf_h
 
 %build
 sed -ie "s^KSRC.*=.*$^KSRC=/lib/modules/`uname -r`/build^" Makefile
@@ -67,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 17 2009 Oliver Falk <oliver@linux-kernel.at> - 1.0-0.2.pre20040408
+- Hack in patches to compile with kernel > 2.6.25
+
 * Thu Sep 27 2007 Oliver Falk <oliver@linux-kernel.at> - 1.0-0.1.pre20040408
 - bz#294641:
   - New versioning - versioning guidelines