diff -r 3bbdae468b05 -r 60207b2b4b42 jdk/src/share/classes/java/util/TimeZone.java
--- a/jdk/src/share/classes/java/util/TimeZone.java	Thu Apr 11 19:15:24 2013 -0700
+++ b/jdk/src/share/classes/java/util/TimeZone.java	Fri Apr 12 07:57:35 2013 -0700
@@ -559,7 +559,7 @@
      * @since 1.8
      */
     public ZoneId toZoneId() {
-        return ZoneId.of(getID(), ZoneId.OLD_IDS_POST_2005);
+        return ZoneId.of(getID(), ZoneId.SHORT_IDS);
     }
 
     private static TimeZone getTimeZone(String ID, boolean fallback) {