diff --git a/mkbuildtree.patch b/mkbuildtree.patch
new file mode 100644
index 0000000..d8e479c
--- /dev/null
+++ b/mkbuildtree.patch
@@ -0,0 +1,20 @@
+Index: xen-3.4.1-testing/unmodified_drivers/linux-2.6/mkbuildtree
+===================================================================
+--- xen-3.4.1-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
++++ xen-3.4.1-testing/unmodified_drivers/linux-2.6/mkbuildtree
+@@ -47,7 +47,14 @@ ln -nsf ${XEN}/include/public include/xe
+ # be native and not xenolinux).
+ case "$uname" in
+ i[34567]86|x86_64)
+-    if [ -d ${XL}/include/asm-x86 ]; then
++    if [ -d ${XL}/arch/x86/include/mach-xen ]; then
++        ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypervisor.h include/asm
++        ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypercall*.h include/asm
++        ln -sf ${XL}/arch/x86/include/mach-xen/asm/synch_bitops*.h include/asm
++        ln -sf ${XL}/arch/x86/include/mach-xen/asm/maddr*.h include/asm
++        ln -sf ${XL}/arch/x86/include/mach-xen/asm/gnttab_dma.h include/asm
++        ln -sf ${XL}/arch/x86/lib/scrub.c balloon
++    elif [ -d ${XL}/include/asm-x86 ]; then
+         ln -sf ${XL}/include/asm-x86/mach-xen/asm/hypervisor.h include/asm
+         ln -sf ${XL}/include/asm-x86/mach-xen/asm/hypercall*.h include/asm
+         ln -sf ${XL}/include/asm-x86/mach-xen/asm/synch_bitops*.h include/asm
diff --git a/xen.changes b/xen.changes
index ce0ba63..57b1387 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,7 +1,15 @@
+-------------------------------------------------------------------
+Fri Aug 14 13:00:48 MDT 2009 - carnold@novell.com
+
+- Modify the mkbuildtree script so the KMPs will build. 
+  mkbuildtree.patch
+
 -------------------------------------------------------------------
 Mon Aug 10 16:21:00 EDT 2009 - ksrinivasan@novell.com
 
 - bnc#524071 - implemented workaround for a windows7 bug.
+  hv_win7_eoi_bug.patch
+
 -------------------------------------------------------------------
 Fri Aug  7 10:43:32 MDT 2009 - jfehlig@novell.com
 
diff --git a/xen.spec b/xen.spec
index 89662b0..647c2c2 100644
--- a/xen.spec
+++ b/xen.spec
@@ -24,7 +24,7 @@ ExclusiveArch:  %ix86 x86_64
 %define xvermaj 3
 %define changeset 19718
 %define xen_build_dir xen-3.4.1-testing
-%define with_kmp 0
+%define with_kmp 1
 BuildRequires:  LibVNCServer-devel SDL-devel automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel texinfo transfig
 %if %suse_version >= 1030
 BuildRequires:  texlive texlive-latex
@@ -38,7 +38,7 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 BuildRequires:  kernel-source kernel-syms module-init-tools xorg-x11
 %endif
 Version:        3.4.1_19718_01
-Release:        1
+Release:        2
 License:        GPL v2 only
 Group:          System/Kernel
 AutoReqProv:    on
@@ -121,6 +121,7 @@ Patch163:       checkpoint-rename.patch
 Patch164:       network-nat.patch
 Patch165:       ioemu-debuginfo.patch
 Patch166:       xm-save-check-file.patch 
+Patch167:       mkbuildtree.patch
 # Patches for snapshot support
 Patch200:       snapshot-ioemu-save.patch
 Patch201:       snapshot-ioemu-restore.patch
@@ -171,7 +172,8 @@ Patch503:       hv_win7_eoi_bug.patch
 Patch999:       tmp_build.patch
 Url:            http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
+#%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
+%define pyver %(python -c "import sys; print sys.version[:3]")
 %if %{?with_kmp}0
 %suse_kernel_module_package -n xen um xen -f kmp_filelist
 %endif
@@ -548,6 +550,7 @@ Authors:
 %patch164 -p1
 %patch165 -p1
 %patch166 -p1
+%patch167 -p1
 %patch200 -p1
 %patch201 -p1
 %patch202 -p1
@@ -755,7 +758,8 @@ rm -f  $RPM_BUILD_ROOT/usr/share/xen/qemu/openbios-sparc32
 rm -f  $RPM_BUILD_ROOT/usr/share/xen/qemu/openbios-sparc64
 rm -f  $RPM_BUILD_ROOT/usr/share/xen/qemu/openbios-ppc
 rm -f  $RPM_BUILD_ROOT/usr/sbin/netfix
-rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
+#rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
+rm -f  $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/*.egg-info
 rm -rf $RPM_BUILD_ROOT/html
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 rm -f  $RPM_BUILD_ROOT/usr/share/doc/xen/create.dtd
@@ -863,8 +867,10 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 %{_defaultdocdir}/xen/boot.local.xenU
 %{_defaultdocdir}/xen/boot.xen
 %{_defaultdocdir}/xen/misc
-%dir %pysite/xen
-%dir %pysite/grub
+#%dir %pysite/xen
+%dir %{_libdir}/python%{pyver}/site-packages/xen
+#%dir %pysite/grub
+%dir %{_libdir}/python%{pyver}/site-packages/grub
 # formerly tools-ioemu
 %dir %{_datadir}/xen
 %dir %{_datadir}/xen/man
@@ -883,10 +889,13 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 /usr/lib/xen/bin/xc_kexec
 %endif
 /usr/lib/xen/boot/hvmloader
-%pysite/xen/*
+#%pysite/xen/*
+%{_libdir}/python%{pyver}/site-packages/xen/*
 /usr/lib/xen/boot/domUloader.py
-%pysite/grub/*
-%pysite/fsimage.so
+#%pysite/grub/*
+%{_libdir}/python%{pyver}/site-packages/grub/*
+#%pysite/fsimage.so
+%{_libdir}/python%{pyver}/site-packages/fsimage.so
 
 %files tools-domU
 %defattr(-,root,root)