diff --git a/WebContent/WEB-INF/lib/vaadin-6.5.4.jar b/WebContent/WEB-INF/lib/vaadin-6.5.4.jar
deleted file mode 100644
index 5ca3811..0000000
Binary files a/WebContent/WEB-INF/lib/vaadin-6.5.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/vaadin-6.6.4.jar b/WebContent/WEB-INF/lib/vaadin-6.6.4.jar
deleted file mode 100644
index 72f965b..0000000
Binary files a/WebContent/WEB-INF/lib/vaadin-6.6.4.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 7761954..935fc16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.haulmont.thirdparty</groupId>
     <artifactId>appletintegration</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.9</version>
+    <version>1.2.10</version>
     <name>Vaadin AppletIntegration Addon</name>
 
     <properties>
@@ -47,11 +47,13 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-server</artifactId>
             <version>${vaadin.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-client-compiled</artifactId>
             <version>${vaadin.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
@@ -63,6 +65,7 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-themes</artifactId>
             <version>${vaadin.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -156,6 +159,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.26</version>
                 <configuration>
                     <webAppSourceDirectory>${basedir}/WebContent</webAppSourceDirectory>
                     <webAppConfig>
diff --git a/src/org/vaadin/applet/client/ui/AppletIntegrationConnector.java b/src/org/vaadin/applet/client/ui/AppletIntegrationConnector.java
index af7879c..028ffd6 100644
--- a/src/org/vaadin/applet/client/ui/AppletIntegrationConnector.java
+++ b/src/org/vaadin/applet/client/ui/AppletIntegrationConnector.java
@@ -1,19 +1,29 @@
+/*
+ * Copyright (c) 2011 Haulmont Technology Ltd. All Rights Reserved.
+ * Haulmont Technology proprietary and confidential.
+ * Use is subject to license terms.
+ */
+
 package org.vaadin.applet.client.ui;
 
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.Paintable;
 import com.vaadin.client.UIDL;
+import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
 import org.vaadin.applet.AppletIntegration;
 
+import java.util.logging.Logger;
+
 /**
  * @author artamonov
- * @version $Id$
  */
 @Connect(AppletIntegration.class)
 public class AppletIntegrationConnector extends AbstractComponentConnector implements Paintable {
 
+    protected Logger log = Logger.getLogger("AppletIntegrationConnector");
+
     @Override
     public VAppletIntegration getWidget() {
         return (VAppletIntegration) super.getWidget();
@@ -21,6 +31,21 @@ public VAppletIntegration getWidget() {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+        log.info("Set applet parameters");
+
         getWidget().updateFromUIDL(uidl, client);
     }
+
+    @Override
+    public void onStateChanged(StateChangeEvent stateChangeEvent) {
+        log.info("Applet state changed");
+
+        super.onStateChanged(stateChangeEvent);
+
+        if (stateChangeEvent.hasPropertyChanged("width"))
+            getWidget().setWidth(getState().width);
+
+        if (stateChangeEvent.hasPropertyChanged("height"))
+            getWidget().setHeight(getState().height);
+    }
 }
\ No newline at end of file
diff --git a/src/org/vaadin/applet/client/ui/VAppletIntegration.java b/src/org/vaadin/applet/client/ui/VAppletIntegration.java
index 519989c..24bd62b 100644
--- a/src/org/vaadin/applet/client/ui/VAppletIntegration.java
+++ b/src/org/vaadin/applet/client/ui/VAppletIntegration.java
@@ -84,6 +84,7 @@ public VAppletIntegration() {
     /**
      * Called whenever an update is received from the server
      */
+    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         // This call should be made first.
         // It handles sizes, captions, tooltips, etc. automatically.
@@ -144,19 +145,6 @@ public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
                 codebase = uidl.getStringAttribute(ATTR_APPLET_CODEBASE);
             }
 
-            // Width and height if provided
-            if (uidl.hasAttribute("width")) {
-                setWidth(uidl.getStringAttribute("width"));
-            } else {
-                setWidth("0");
-            }
-
-            if (uidl.hasAttribute("height")) {
-                setHeight(uidl.getStringAttribute("height"));
-            } else {
-                setHeight("0");
-            }
-
             if (uidl.hasVariable(ATTR_APPLET_ACTION)) {
                 action = client.translateVaadinUri(uidl.getStringVariable(ATTR_APPLET_ACTION));
             } else {