diff --git a/teavm-chrome-rdp/pom.xml b/teavm-chrome-rdp/pom.xml
index a6d041a97..2920df302 100644
--- a/teavm-chrome-rdp/pom.xml
+++ b/teavm-chrome-rdp/pom.xml
@@ -98,7 +98,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Version>0.2.0.qualifier</Bundle-Version>
             <Export-Package>org.teavm.chromerdp</Export-Package>
             <Bundle-SymbolicName>teavm-chrome-rdp</Bundle-SymbolicName>
           </instructions>
diff --git a/teavm-classlib/pom.xml b/teavm-classlib/pom.xml
index 244577cdd..6fee604f8 100644
--- a/teavm-classlib/pom.xml
+++ b/teavm-classlib/pom.xml
@@ -60,7 +60,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Version>0.2.0.qualifier</Bundle-Version>
             <Export-Package>org.teavm.classlib.*</Export-Package>
             <Bundle-SymbolicName>teavm-classlib</Bundle-SymbolicName>
           </instructions>
diff --git a/teavm-core/pom.xml b/teavm-core/pom.xml
index 126e3078b..35170d7ea 100644
--- a/teavm-core/pom.xml
+++ b/teavm-core/pom.xml
@@ -68,7 +68,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Version>0.2.0.qualifier</Bundle-Version>
             <Export-Package>org.teavm.*</Export-Package>
             <Bundle-SymbolicName>teavm-core</Bundle-SymbolicName>
             <Import-Package>org.apache.commons.io;version="[1.4,2.5)",org.junit,org.objectweb.asm;version="[4.2,6)",
diff --git a/teavm-eclipse/teavm-eclipse-feature/feature.xml b/teavm-eclipse/teavm-eclipse-feature/feature.xml
index 3fd025c26..2259b8f99 100644
--- a/teavm-eclipse/teavm-eclipse-feature/feature.xml
+++ b/teavm-eclipse/teavm-eclipse-feature/feature.xml
@@ -458,7 +458,7 @@
          id="teavm-chrome-rdp"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.2.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -489,20 +489,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.aries.spifly.org.apache.aries.spifly.core-internal"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.aries.spifly.org.apache.aries.spifly.weaver-internal"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.aries.util"
          download-size="0"
@@ -531,4 +517,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.jetty.websocket.javax.websocket.server"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/teavm-eclipse/teavm-eclipse-feature/teavm.target b/teavm-eclipse/teavm-eclipse-feature/teavm.target
index 5e87787f9..5c9ed950e 100644
--- a/teavm-eclipse/teavm-eclipse-feature/teavm.target
+++ b/teavm-eclipse/teavm-eclipse-feature/teavm.target
@@ -2,7 +2,7 @@
 <?pde version="3.8"?><target name="TeaVM" sequenceNumber="13">
 <locations>
 <location path="${eclipse_home}" type="Profile"/>
-<location path="${workspace_loc:/teavm-eclipse-repository}/target/repository" type="Directory"/>
+<location path="${workspace_loc:/teavm-eclipse-repository}/target/dependency" type="Directory"/>
 </locations>
 <environment>
 <os>linux</os>
diff --git a/teavm-eclipse/teavm-eclipse-repository/pom.xml b/teavm-eclipse/teavm-eclipse-repository/pom.xml
index 774017fc1..2efef1977 100644
--- a/teavm-eclipse/teavm-eclipse-repository/pom.xml
+++ b/teavm-eclipse/teavm-eclipse-repository/pom.xml
@@ -30,32 +30,65 @@
   <description>A p2 repository for Eclipse that contains TeaVM core together with all required
       dependencies</description>
 
+  <dependencies>
+    <dependency>
+      <groupId>javax.interceptor</groupId>
+      <artifactId>javax.interceptor-api</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>javax.transaction-api</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.aries.spifly</groupId>
+      <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-classlib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-chrome-rdp</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
     </pluginManagement>
     <plugins>
-      <plugin>
+      <!-- plugin>
         <groupId>org.reficio</groupId>
         <artifactId>p2-maven-plugin</artifactId>
         <version>1.1.0</version>
         <executions>
           <execution>
             <id>default-cli</id>
-            <phase>prepare-package</phase>
             <goals>
               <goal>site</goal>
             </goals>
             <configuration>
               <artifacts>
-                <artifact>
-                  <id>javax.interceptor:javax.interceptor-api:1.2</id>
-                </artifact>
-                <artifact>
-                  <id>javax.enterprise:cdi-api:1.2</id>
-                </artifact>
-                <artifact>
-                  <id>javax.transaction:javax.transaction-api:1.2</id>
-                </artifact>
                 <artifact>
                   <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.1</id>
                 </artifact>
@@ -78,6 +111,20 @@
             </configuration>
           </execution>
         </executions>
+      </plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.8</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/site.xml b/teavm-eclipse/teavm-eclipse-updatesite/site.xml
index bbdbb2bf4..28d5c4d23 100644
--- a/teavm-eclipse/teavm-eclipse-updatesite/site.xml
+++ b/teavm-eclipse/teavm-eclipse-updatesite/site.xml
@@ -3,7 +3,7 @@
    <description name="TeaVM update site">
       TeaVM update site
    </description>
-   <feature url="features/teavm-eclipse-feature_0.2.0.qualifier.jar" id="teavm-eclipse-feature" version="0.2.0.qualifier" os="aix,hpux,linux,macosx,qnx,solaris,win32" ws="carbon,cocoa,gtk,motif,photon,win32,wpf" arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64">
+   <feature url="features/teavm-eclipse-feature_0.2.0.qualifier.jar" id="teavm-eclipse-feature" version="0.0.0" os="aix,hpux,linux,macosx,qnx,solaris,win32" ws="carbon,cocoa,gtk,motif,photon,win32,wpf" arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64">
       <category name="teavm-eclipse-caregory"/>
    </feature>
    <category-def name="teavm-eclipse-caregory" label="TeaVM"/>
diff --git a/teavm-platform/pom.xml b/teavm-platform/pom.xml
index d170dfcb4..0405a6cbb 100644
--- a/teavm-platform/pom.xml
+++ b/teavm-platform/pom.xml
@@ -50,7 +50,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Version>0.2.0.qualifier</Bundle-Version>
             <Export-Package>org.teavm.platform.*</Export-Package>
             <Bundle-SymbolicName>teavm-platform</Bundle-SymbolicName>
           </instructions>