diff --git a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index ee8d09d..e6fb467 100644
--- a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++ b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -55,10 +55,10 @@
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.commons.ClassRemapper;
 import org.objectweb.asm.commons.GeneratorAdapter;
 import org.objectweb.asm.commons.Method;
 import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
 import org.objectweb.asm.commons.SimpleRemapper;
 
 /**
@@ -156,7 +156,7 @@
         }
     }
 
-    private static final class Remap extends RemappingClassAdapter {
+    private static final class Remap extends ClassRemapper {
         private final class RewriteConstructor extends MethodVisitor {
             private RewriteConstructor(final MethodVisitor wrapped) {
                 super(Opcodes.ASM5, wrapped);
diff --git a/pom.xml b/pom.xml
index 3ba3952..2422228 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
     <maven.compiler.target>1.6</maven.compiler.target>
 
     <ant.version>1.9.4</ant.version>
-    <asm.version>5.0.4</asm.version>
+    <asm.version>5.1</asm.version>
   </properties>
 
   <developers>