diff --git a/xen-compile-fixes.patch b/xen-compile-fixes.patch
index 46dfa2d..a4b2427 100644
--- a/xen-compile-fixes.patch
+++ b/xen-compile-fixes.patch
@@ -1,55 +1,48 @@
---- xen-unstable-11234/tools/blktap/drivers/Makefile.compile	2006-08-23 06:27:06.000000000 -0400
-+++ xen-unstable-11234/tools/blktap/drivers/Makefile	2006-08-23 16:16:28.000000000 -0400
-@@ -10,9 +10,6 @@
- INSTALL_DIR  = /usr/sbin
+diff -ruN xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile
+--- xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile	2007-01-08 10:00:46.000000000 -0500
++++ xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile	2007-01-18 11:26:37.000000000 -0500
+@@ -8,7 +8,7 @@
+ INST_DIR  = /usr/sbin
  LIBAIO_DIR   = ../../libaio/src
  
 -CFLAGS   += -Werror
--CFLAGS   += -Wno-unused
--CFLAGS   += -fno-strict-aliasing
++#CFLAGS   += -Werror
+ CFLAGS   += -Wno-unused
+ CFLAGS   += -fno-strict-aliasing
  CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
- CFLAGS   += $(INCLUDES) -I. -I../../xenstore 
- CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
---- xen-unstable-11234/Config.mk.compile	2006-08-23 06:27:06.000000000 -0400
-+++ xen-unstable-11234/Config.mk	2006-08-23 16:16:28.000000000 -0400
-@@ -10,7 +10,7 @@
+diff -ruN xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile xen-3.0.4_1-src.new/tools/blktap/lib/Makefile
+--- xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile	2007-01-08 10:00:47.000000000 -0500
++++ xen-3.0.4_1-src.new/tools/blktap/lib/Makefile	2007-01-18 11:26:45.000000000 -0500
+@@ -14,7 +14,7 @@
+ SRCS     :=
+ SRCS     += xenbus.c blkif.c xs_api.c
+ 
+-CFLAGS   += -Werror
++#CFLAGS   += -Werror
+ CFLAGS   += -Wno-unused
+ CFLAGS   += -fno-strict-aliasing -fPIC
+ # get asprintf():
+diff -ruN xen-3.0.4_1-src.orig/tools/console/Makefile xen-3.0.4_1-src.new/tools/console/Makefile
+--- xen-3.0.4_1-src.orig/tools/console/Makefile	2007-01-08 10:00:47.000000000 -0500
++++ xen-3.0.4_1-src.new/tools/console/Makefile	2007-01-18 11:26:00.000000000 -0500
+@@ -5,7 +5,7 @@
+ DAEMON_INSTALL_DIR = /usr/sbin
+ CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
  
- # Tools to run on system hosting the build
- HOSTCC     = gcc
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+-CFLAGS  += -Werror
++#CFLAGS  += -Werror
  
- AS         = $(CROSS_COMPILE)as
- LD         = $(CROSS_COMPILE)ld
---- xen-3.0.3_0-src/tools/xenstore/Makefile.compile	2006-12-14 14:13:10.000000000 -0500
-+++ xen-3.0.3_0-src/tools/xenstore/Makefile	2006-12-14 14:13:14.000000000 -0500
-@@ -11,7 +11,7 @@
- INSTALL_DIR     = $(INSTALL) -d -m0755
+ CFLAGS  += -I $(XEN_LIBXC)
+ CFLAGS  += -I $(XEN_XENSTORE)
+diff -ruN xen-3.0.4_1-src.orig/tools/xenstore/Makefile xen-3.0.4_1-src.new/tools/xenstore/Makefile
+--- xen-3.0.4_1-src.orig/tools/xenstore/Makefile	2007-01-08 10:00:52.000000000 -0500
++++ xen-3.0.4_1-src.new/tools/xenstore/Makefile	2007-01-18 11:25:48.000000000 -0500
+@@ -6,7 +6,7 @@
+ MINOR = 0
  
  PROFILE=#-pg
--BASECFLAGS=-Wall -g -Werror
-+BASECFLAGS=-Wall -g 
+-BASECFLAGS=-Werror
++BASECFLAGS=
  # Make gcc generate dependencies.
  BASECFLAGS += -Wp,-MD,.$(@F).d
  PROG_DEP = .*.d
---- xen-3.0.3_0-src/tools/console/Makefile.compile	2006-12-14 14:15:01.000000000 -0500
-+++ xen-3.0.3_0-src/tools/console/Makefile	2006-12-14 14:15:08.000000000 -0500
-@@ -9,7 +9,7 @@
- INSTALL_PROG    = $(INSTALL) -m0755
- INSTALL_DIR     = $(INSTALL) -d -m0755
- 
--CFLAGS  += -Werror -g
-+CFLAGS  += -g
- 
- CFLAGS  += -I $(XEN_LIBXC)
- CFLAGS  += -I $(XEN_XENSTORE)
---- xen-3.0.3_0-src/tools/blktap/lib/Makefile.compile	2006-12-14 14:16:53.000000000 -0500
-+++ xen-3.0.3_0-src/tools/blktap/lib/Makefile	2006-12-14 14:16:58.000000000 -0500
-@@ -18,7 +18,6 @@
- SRCS     :=
- SRCS     += xenbus.c blkif.c xs_api.c
- 
--CFLAGS   += -Werror
- CFLAGS   += -Wno-unused
- CFLAGS   += -fno-strict-aliasing -fPIC
- CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
diff --git a/xen.spec b/xen.spec
index 765d308..0c89eb5 100644
--- a/xen.spec
+++ b/xen.spec
@@ -84,8 +84,7 @@ virtual machines.
 %setup -q -n xen-3.0.4_1-src -a 1
 # XXX fix this
 #%patch1 -p1 -b .init
-# XXX fix
-#%patch3 -p1 -b .compile
+%patch3 -p1 -b .compile
 %patch6 -p1
 #patch8 -p1 # FIXME: need to pull this one back