diff -Nru icedtea-web-1.2.3/debian/changelog icedtea-web-1.2.3/debian/changelog
--- icedtea-web-1.2.3/debian/changelog	2013-04-22 22:07:16.000000000 +0000
+++ icedtea-web-1.2.3/debian/changelog	2013-07-01 18:27:23.000000000 +0000
@@ -1,3 +1,9 @@
+icedtea-web (1.2.3-0ubuntu0.12.04.3) precise-security; urgency=low
+
+  * debian/patches/work-with-icedtea-8004584.patch: work with OpenJDK build 25
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Mon, 01 Jul 2013 13:27:03 -0500
+
 icedtea-web (1.2.3-0ubuntu0.12.04.2) precise-security; urgency=low
 
   * Revert PR1161: X509VariableTrustManager does not work correctly with
diff -Nru icedtea-web-1.2.3/debian/patches/series icedtea-web-1.2.3/debian/patches/series
--- icedtea-web-1.2.3/debian/patches/series	2013-04-22 21:44:48.000000000 +0000
+++ icedtea-web-1.2.3/debian/patches/series	2013-07-01 18:26:52.000000000 +0000
@@ -2,3 +2,4 @@
 gcc-option-order.diff
 itweb-settings.diff
 lp1171506.patch
+work-with-icedtea-8004584.patch
diff -Nru icedtea-web-1.2.3/debian/patches/work-with-icedtea-8004584.patch icedtea-web-1.2.3/debian/patches/work-with-icedtea-8004584.patch
--- icedtea-web-1.2.3/debian/patches/work-with-icedtea-8004584.patch	1970-01-01 00:00:00.000000000 +0000
+++ icedtea-web-1.2.3/debian/patches/work-with-icedtea-8004584.patch	2013-07-01 18:27:35.000000000 +0000
@@ -0,0 +1,67 @@
+
+# HG changeset patch
+# User Jiri Vanek <jvanek@redhat.com>
+# Date 1371734457 -7200
+# Node ID 2469bedc6d63aa59da025cc1f479846344895ed5
+# Parent  fa6a80c73e0daf4fe187ee6f6f7423dc2e2a497d
+Made it work with OpenJDK build 25 by creating application as soon as possible
+
+Index: icedtea-web-1.2.3/netx/net/sourceforge/jnlp/runtime/Boot.java
+===================================================================
+--- icedtea-web-1.2.3.orig/netx/net/sourceforge/jnlp/runtime/Boot.java	2013-07-01 13:27:29.000000000 -0500
++++ icedtea-web-1.2.3/netx/net/sourceforge/jnlp/runtime/Boot.java	2013-07-01 13:27:29.000000000 -0500
+@@ -35,6 +35,8 @@
+ import net.sourceforge.jnlp.cache.UpdatePolicy;
+ import net.sourceforge.jnlp.security.viewer.CertificateViewer;
+ import net.sourceforge.jnlp.services.ServiceUtil;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
+ 
+ /**
+  * This is the main entry point for the JNLP client.  The main
+@@ -113,6 +115,9 @@
+      * Launch the JNLP file specified by the command-line arguments.
+      */
+     public static void main(String[] argsIn) {
++        if (AppContext.getAppContext() == null) {
++            SunToolkit.createNewAppContext();
++        }
+         args = argsIn;
+ 
+         if (null != getOption("-viewer")) {
+Index: icedtea-web-1.2.3/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+===================================================================
+--- icedtea-web-1.2.3.orig/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	2013-07-01 13:27:29.000000000 -0500
++++ icedtea-web-1.2.3/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	2013-07-01 13:27:29.000000000 -0500
+@@ -218,7 +218,7 @@
+         try {
+             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+         } catch (Exception e) {
+-            // ignore it
++            e.printStackTrace();
+         }
+ 
+         doMainAppContextHacks();
+Index: icedtea-web-1.2.3/plugin/icedteanp/java/sun/applet/PluginMain.java
+===================================================================
+--- icedtea-web-1.2.3.orig/plugin/icedteanp/java/sun/applet/PluginMain.java	2013-07-01 13:27:29.000000000 -0500
++++ icedtea-web-1.2.3/plugin/icedteanp/java/sun/applet/PluginMain.java	2013-07-01 13:27:29.000000000 -0500
+@@ -72,6 +72,8 @@
+ import java.net.ProxySelector;
+ import java.util.Enumeration;
+ import java.util.Properties;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
+ 
+ import net.sourceforge.jnlp.config.DeploymentConfiguration;
+ import net.sourceforge.jnlp.runtime.JNLPRuntime;
+@@ -94,6 +96,9 @@
+      */
+     public static void main(String args[])
+             throws IOException {
++        if (AppContext.getAppContext() == null) {
++            SunToolkit.createNewAppContext();
++        }
+         if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
+             System.err.println("Invalid pipe names provided. Refusing to proceed.");
+             System.exit(1);