diff -rN -u old-frugalware-current-1/source/apps-extra/user-mode-linux/FrugalBuild new-frugalware-current/source/apps-extra/user-mode-linux/FrugalBuild
--- old-frugalware-current-1/source/apps-extra/user-mode-linux/FrugalBuild	2006-10-17 22:17:47.000000000 +0200
+++ new-frugalware-current/source/apps-extra/user-mode-linux/FrugalBuild	2006-10-17 22:17:59.000000000 +0200
@@ -3,7 +3,8 @@
 # Maintainer: VMiklos <vmiklos@frugalware.org>
 
 pkgname=user-mode-linux
-pkgver=2.6.16
+pkgver=2.6.18
+patchlevel=.1
 pkgrel=1
 pkgdesc="A safe, secure way of running Linux versions and Linux processes."
 url="http://user-mode-linux.sourceforge.net/"
@@ -11,13 +12,11 @@
 groups=('apps-extra')
 archs=('i686' 'x86_64')
 up2date="lynx -dump http://www.kernel.org/kdist/finger_banner |sed -n 's/.* \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/;1 p'"
-source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$pkgver.tar.bz2 config)
-sha1sums=('bef21cd5063a648f33a99a26f4742dd05eb4dca2' \
-	  '34e9e032ec185ac88cc05705fb103562eceacf3c')
+source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$pkgver$patchlevel.tar.bz2 config foo.diff)
 
 build()
 {
-	Fcd linux-$pkgver
+	Fcd linux-$pkgver$patchlevel
 	cp $Fsrcdir/config .config
 	Fsed "486" "`echo ${MARCH:-$CARCH}|sed 's/^i//'`" .config
 	Fpatchall
diff -rN -u old-frugalware-current-1/source/apps-extra/user-mode-linux/foo.diff new-frugalware-current/source/apps-extra/user-mode-linux/foo.diff
--- old-frugalware-current-1/source/apps-extra/user-mode-linux/foo.diff	1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current/source/apps-extra/user-mode-linux/foo.diff	2006-10-17 22:17:59.000000000 +0200
@@ -0,0 +1,34 @@
+I need this patch to get a UML kernel to compile.  This is with the kernel
+headers in FC6 which are automatically generated from the kernel tree.
+Some headers are missing but those files don't need them.  At least it
+appears so since the resuling kernel works fine.
+
+Tested on x86-64.
+
+
+Signed-off-by: Ulrich Drepper <drepper@redhat.com>
+
+diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
+index 59cfa9e..cec9fcc 100644
+--- a/arch/um/include/kern_util.h
++++ b/arch/um/include/kern_util.h
+@@ -6,7 +6,6 @@
+ #ifndef __KERN_UTIL_H__
+ #define __KERN_UTIL_H__
+ 
+-#include "linux/threads.h"
+ #include "sysdep/ptrace.h"
+ #include "sysdep/faultinfo.h"
+ 
+diff --git a/arch/um/sys-x86_64/stub_segv.c b/arch/um/sys-x86_64/stub_segv.c
+index 1c96702..652fa34 100644
+--- a/arch/um/sys-x86_64/stub_segv.c
++++ b/arch/um/sys-x86_64/stub_segv.c
+@@ -5,7 +5,6 @@
+ 
+ #include <stddef.h>
+ #include <signal.h>
+-#include <linux/compiler.h>
+ #include <asm/unistd.h>
+ #include "uml-config.h"
+ #include "sysdep/sigcontext.h"