diff -Nru modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java modules/weaver/src/org/aspectj/weaver/bcel-gil/asm/AsmDetector.java
--- modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java	2011-08-08 22:21:33.000000000 +0200
+++ modules/weaver/src/org/aspectj/weaver/bcel-gil/asm/AsmDetector.java	2012-01-28 16:33:18.309111256 +0100
@@ -24,8 +24,8 @@
 
 	static {
 		try {
-			Class<?> reader = Class.forName("aj.org.objectweb.asm.ClassReader");
-			Class<?> visitor = Class.forName("aj.org.objectweb.asm.ClassVisitor");
+			Class<?> reader = Class.forName("org.objectweb.asm.ClassReader");
+			Class<?> visitor = Class.forName("org.objectweb.asm.ClassVisitor");
 			Method m = reader.getMethod("accept", new Class[] { visitor, Integer.TYPE });
 			isAsmAround = m != null;
 		} catch (Exception e) {
diff -Nru modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java modules/weaver/src/org/aspectj/weaver/bcel-gil/asm/StackMapAdder.java
--- modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java	2011-08-08 22:21:33.000000000 +0200
+++ modules/weaver/src/org/aspectj/weaver/bcel-gil/asm/StackMapAdder.java	2012-01-28 16:33:40.796112357 +0100
@@ -15,8 +15,8 @@
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.World;
 
-import aj.org.objectweb.asm.ClassReader;
-import aj.org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
 
 /**
  * Uses asm to add the stack map attribute to methods in a class. The class is passed in as pure byte data and then a reader/writer