diff --git a/classlib/pom.xml b/classlib/pom.xml
index 85bcec9a9..feb133eec 100644
--- a/classlib/pom.xml
+++ b/classlib/pom.xml
@@ -76,7 +76,7 @@
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-debug-all</artifactId>
+      <artifactId>asm-util</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index a18082983..c88c77e11 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -51,7 +51,11 @@
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-debug-all</artifactId>
+      <artifactId>asm-commons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
     </dependency>
     <dependency>
       <groupId>com.carrotsearch</groupId>
diff --git a/pom.xml b/pom.xml
index 22fcb9273..8b746ed95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,8 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.teavm</groupId>
@@ -70,6 +71,7 @@
     <selenium.version>2.47.2</selenium.version>
     <jackson.version>2.6.2</jackson.version>
     <idea.version>2016.3.4</idea.version>
+    <asm.version>6.1.1</asm.version>
 
     <teavm.test.incremental>false</teavm.test.incremental>
     <teavm.test.threads>1</teavm.test.threads>
@@ -131,8 +133,13 @@
       </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
-        <artifactId>asm-debug-all</artifactId>
-        <version>5.2</version>
+        <artifactId>asm-commons</artifactId>
+        <version>${asm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm-util</artifactId>
+        <version>${asm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
diff --git a/samples/benchmark/pom.xml b/samples/benchmark/pom.xml
index 2ccf4f3a3..83d47bbed 100644
--- a/samples/benchmark/pom.xml
+++ b/samples/benchmark/pom.xml
@@ -200,18 +200,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.netbeans.html</groupId>
-        <artifactId>html4j-maven-plugin</artifactId>
-        <version>1.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process-js-annotations</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/tools/idea/idea-artifacts/dep-pom.xml b/tools/idea/idea-artifacts/dep-pom.xml
index c1c087f67..0959fb6bf 100644
--- a/tools/idea/idea-artifacts/dep-pom.xml
+++ b/tools/idea/idea-artifacts/dep-pom.xml
@@ -115,7 +115,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.1</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/tools/maven/plugin/pom.xml b/tools/maven/plugin/pom.xml
index 17e564954..f84d47dbc 100644
--- a/tools/maven/plugin/pom.xml
+++ b/tools/maven/plugin/pom.xml
@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.5.1</version>
         <configuration>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
           <goalPrefix>teavm</goalPrefix>