diff -Naur grub-0.97.orig/stage2/graphics.c grub-0.97/stage2/graphics.c
--- grub-0.97.orig/stage2/graphics.c 1969-12-31 21:00:00.000000000 -0300
+++ grub-0.97/stage2/graphics.c 2005-06-13 19:13:31.000000000 -0300
-@@ -0,0 +1,585 @@
+@@ -0,0 +1,584 @@
+/*
+ * graphics.c - graphics mode support for GRUB
+ * Implemented as a terminal type by Jeremy Katz <katzj@redhat.com> based
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * along with this program; If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifdef SUPPORT_GRAPHICS
diff -Naur grub-0.97.orig/stage2/graphics.h grub-0.97/stage2/graphics.h
--- grub-0.97.orig/stage2/graphics.h 1969-12-31 21:00:00.000000000 -0300
+++ grub-0.97/stage2/graphics.h 2005-06-12 20:56:49.000000000 -0300
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,43 @@
+/* graphics.h - graphics console interface */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * along with this program; If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef GRAPHICS_H
diff -up /dev/null grub-upstream.wip/stage2/btrfs.h
--- /dev/null 2009-06-03 06:46:26.160951000 +0000
+++ grub-upstream.wip/stage2/btrfs.h 2012-03-20 05:07:09.000000000 +0000
-@@ -0,0 +1,1415 @@
+@@ -0,0 +1,1413 @@
+/* btrfs.h - an extraction from btrfs-progs-0.18/ctree.h into one file
+ *
+ * Copyright (C) 2007 Oracle. All rights reserved.
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
-+ * License along with this program; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 021110-1307, USA.
++ * License along with this program; If not, see <http://www.gnu.org/licenses/>
+ */
+
+/* include/asm-i386/types.h */