--- a/ChangeLog	Tue Oct 09 12:15:36 2007 -0400
+++ b/ChangeLog	Thu Oct 11 18:34:30 2007 -0400
@@ -1,3 +1,7 @@
+2007-10-11  Lillian Angel  <langel@redhat.com>
+
+	* patches/icedtea-license-headers.patch: Re-added genExceptions patch.
+
 2007-10-09  Lillian Angel  <langel@redhat.com>
 
 	* Makefile.am: Added sanity check for bootstrap/jdk1.6.0/bin/java in

--- a/README	Tue Oct 09 12:15:36 2007 -0400
+++ b/README	Thu Oct 11 18:34:30 2007 -0400
@@ -71,15 +71,6 @@
  - We are assuming that these files are owned by Sun:
    openjdk/j2se/src/share/classes/**/resources/*.properties
 
-The downloaded sources include two scripts that insert proprietary
-license headers into the source files they generate.  The scripts
-themselves are GPL'd so we patched them to emit the GPL header.  These
-files are:
-
-  openjdk/j2se/make/java/nio/genExceptions.sh
-  openjdk/hotspot/src/share/vm/prims/jvmtiLib.xsl
-
-
 gcjwebplugin
 ============
 

--- a/patches/icedtea-license-headers.patch	Tue Oct 09 12:15:36 2007 -0400
+++ b/patches/icedtea-license-headers.patch	Thu Oct 11 18:34:30 2007 -0400
@@ -1,3 +1,38 @@
+--- genExceptions.sh.orig       2007-08-15 14:47:22.000000000 -0400
++++ openjdk/j2se/make/java/nio/genExceptions.sh 2007-08-15 14:49:01.000000000 -0400
+@@ -42,10 +42,28 @@
+
+   cat >$out <<__END__
+ /*
+- * Copyright 2007 by Sun Microsystems, Inc.  All Rights Reserved.
+- * 
+- * This software is the proprietary information of Sun Microsystems, Inc.  
+- * Use is subject to license terms.
++ * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
+  */
+
+ // -- This file was mechanically generated: Do not edit! -- //
 --- /notnfs/langel/openjdk/j2se/make/tools/AutoMulti/AutoMulti.java	2007-08-16 03:17:52.000000000 -0400
 +++ openjdk/j2se/make/tools/src/build/tools/automulti/AutoMulti.java	2007-08-27 12:38:38.000000000 -0400
 @@ -99,14 +99,29 @@