diff --git a/7090844.patch b/7090844.patch
new file mode 100644
index 0000000..fd5b531
--- /dev/null
+++ b/7090844.patch
@@ -0,0 +1,38 @@
+--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:42:30.000000000 -0400
++++ sun/tools/javazic/Mappings.java    2015-04-13 12:43:32.000000000 -0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. 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
+@@ -26,9 +26,6 @@
+ package sun.tools.javazic;
+ 
+ import        java.util.ArrayList;
+-import        java.util.HashMap;
+-import        java.util.HashSet;
+-import        java.util.Iterator;
+ import        java.util.LinkedList;
+ import        java.util.List;
+ import        java.util.Map;
+@@ -79,8 +76,8 @@
+           // If the GMT offset of this Zone will change in some
+           // future time, this Zone is added to the exclude list.
+             boolean isExcluded = false;
+-          if (zone.size() > 1) {
+-              ZoneRec zrec = zone.get(zone.size()-2);
++            for (int i = 0; i < zone.size(); i++) {
++                ZoneRec zrec = zone.get(i);
+               if ((zrec.getGmtOffset() != rawOffset)
+                   && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
+                   if (excludeList == null) {
+@@ -88,6 +85,7 @@
+                   }
+                   excludeList.add(zone.getName());
+                     isExcluded = true;
++                    break;
+               }
+           }
+