diff --git a/.cvsignore b/.cvsignore
index fbd6953..1b75aa7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-memtest86+-1.70.tar.gz
+memtest86+-2.00.tar.gz
diff --git a/memtest-intelmac-3.diff b/memtest-intelmac-3.diff
index f309c08..9df1aee 100644
--- a/memtest-intelmac-3.diff
+++ b/memtest-intelmac-3.diff
@@ -1,21 +1,21 @@
-diff -urpN memtest86+-1.70/setup.S.mactel memtest86+-1.70/setup.S
---- memtest86+-1.70/setup.S.mactel	2007-10-24 13:10:59.000000000 -0400
-+++ memtest86+-1.70/setup.S	2007-10-24 13:12:26.000000000 -0400
-@@ -29,6 +29,33 @@ start:
+diff -up memtest86+-2.00/setup.S.orig memtest86+-2.00/setup.S
+--- memtest86+-2.00/setup.S.orig	2008-02-07 17:27:42.000000000 +0100
++++ memtest86+-2.00/setup.S	2008-02-11 14:56:26.000000000 +0100
+@@ -30,6 +30,33 @@ start:
  	lgdt	gdt_48 - start	# load gdt with whatever appropriate
  
  # that was painless, now we enable A20
 +# start from grub-a20.patch
 +	/*
-+	* try to switch gateA20 using PORT92, the "Fast A20 and Init"
-+	* register
-+	*/
++	 * try to switch gateA20 using PORT92, the "Fast A20 and Init"
++	 * register
++	 */
 +	mov	$0x92, %dx
 +	inb	%dx, %al
 +	/* skip the port92 code if it's unimplemented (read returns 0xff) */
 +	cmpb	$0xff, %al
 +	jz	alt_a20_done
-+	
++
 +	/* set or clear bit1, the ALT_A20_GATE bit */
 +	movb	4(%esp), %ah
 +	testb	%ah, %ah
@@ -32,9 +32,9 @@ diff -urpN memtest86+-1.70/setup.S.mactel memtest86+-1.70/setup.S
 +
 +alt_a20_done:
 +# end from grub-a20.patch
- 
  	call    empty_8042
  
+ 	movb	$0xD1, %al	# command write
 @@ -67,6 +94,9 @@ data32	ljmp	$KERNEL_CS, $(TSTLOAD <<4)	#
  empty_8042:
  	call	delay
@@ -53,4 +53,3 @@ diff -urpN memtest86+-1.70/setup.S.mactel memtest86+-1.70/setup.S
  	ret
  #
  # Delay is needed after doing i/o
-diff -urpN memtest86+-1.70/memsize.c.mactel memtest86+-1.70/memsize.c
diff --git a/memtest86+.spec b/memtest86+.spec
index 5d194ad..c8db0cc 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -5,21 +5,17 @@
 
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
-Version: 1.70
-Release: 4%{?dist}
-License: GPL
+Version: 2.00
+Release: 1%{?dist}
+License: GPLv2
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
 Source0: http://www.memtest.org/download/%{version}/memtest86+-%{version}.tar.gz
 URL: http://www.memtest.org
 Source1: new-memtest-pkg
 Source2: memtest-setup
-# patches from mschmidt@redhat.com to implement boot-time configurable serial console
-Patch0: additional-lib-functions.diff
-Patch1: console-boot-parameter.diff
-Patch2: use-strtoul-in-getval.diff
-Patch3: parity-bits.diff
-Patch4: memtest-intelmac-3.diff
+Patch0: memtest-fix-makefile-for-x86_64.diff
+Patch1: memtest-intelmac-3.diff
 Requires(preun): coreutils
 # require glibc-devel.i386 via this file:
 BuildRequires: %{_includedir}/gnu/stubs-32.h
@@ -38,9 +34,9 @@ Run 'memtest-setup' to add to your GRUB or lilo boot menu.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+# head.s is a generated file, shouldn't have been in the tarball.
+rm head.s
 
 %build
 # Regular build flags not wanted for this binary
@@ -63,7 +59,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README
+# XXX did upstream drop the README by mistake?
+#%doc README
 /boot/memtest86+-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
@@ -72,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/new-memtest-pkg --remove %{version}
 
 %changelog
+* Mon Feb 11 2008 Michal Schmidt <mschmidt@redhat.com> - 2.00-1
+- New upstream release: 2.00.
+- Dropped boot time console configuration patches (already upstream).
+- Fixed compilation on x86_64.
+
 * Wed Oct 24 2007 Peter Jones <pjones@redhat.com> - 1.70-4
 - Fix for mactel.
 
@@ -185,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Mar 7 2002 Dave Heistand <davidbh@bu.edu>
 - updated source to 2.9, also changed setup -n
-- to use %{version}.
+- to use %%{version}.
 
 * Thu Nov  1 2001 Matthew Miller <mattdm@bu.edu>
 - v 2.8a
diff --git a/sources b/sources
index 9068718..606d0a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee447fa46b75cf98538fa60667eb079d  memtest86+-1.70.tar.gz
+b411671e8b2f52d30705e814a56631cb  memtest86+-2.00.tar.gz