Index: pkg-clojure/build.xml
===================================================================
--- pkg-clojure.orig/build.xml	2011-06-14 18:44:29.447220034 +0900
+++ pkg-clojure/build.xml	2011-06-14 18:44:57.235013081 +0900
@@ -87,13 +87,14 @@
   <target name="compile-java" depends="init"
           description="Compile Java sources.">
     <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
+           classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
            debug="true" target="1.5"/>
   </target>
 
   <target name="compile-clojure" depends="compile-java"
           description="Compile Clojure sources.">
     <java classname="clojure.lang.Compile"
-          classpath="${build}:${cljsrc}"
+          classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:${build}:${cljsrc}"
           failonerror="true">
       <sysproperty key="clojure.compile.path" value="${build}"/>
       <!-- <sysproperty key="clojure.compile.warn-on-reflection" value="true"/> -->
@@ -126,7 +127,7 @@
     <delete dir="${test-classes}"/>
     <mkdir dir="${test-classes}"/>
     <java classname="clojure.lang.Compile"
-          classpath="${test-classes}:${test}:${build}:${cljsrc}"
+          classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:${test-classes}:${test}:${build}:${cljsrc}"
           failonerror="true">
       <sysproperty key="clojure.compile.path" value="${test-classes}"/>
       <arg value="clojure.test-clojure.protocols.examples"/>
@@ -138,6 +139,8 @@
           description="Run clojure tests without recompiling first">
     <java classname="clojure.main" failonerror="true">
       <classpath>
+        <path location="/usr/share/java/asm3.jar"/>
+        <path location="/usr/share/java/asm3-commons.jar"/>
         <path location="${test-classes}"/>
         <path location="${test}"/>
         <path location="${build}"/>
@@ -162,7 +165,7 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
+        <attribute name="Class-Path" value="/usr/share/java/asm3.jar /usr/share/java/asm3-commons.jar"/>
       </manifest>
     </jar>
     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
@@ -171,7 +174,6 @@
   <target name="clojure-jar-slim" depends="test"
           description="Create clojure-slim jar file (omits compiled Clojure code)">
     <jar jarfile="${slim_jar}">
-      <fileset dir="${build}" includes="clojure/asm/**"/>
       <fileset dir="${build}" includes="clojure/lang/**"/>
       <fileset dir="${build}" includes="clojure/main.class"/>
       <fileset dir="${cljsrc}">
@@ -180,7 +182,7 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
+        <attribute name="Class-Path" value="/usr/share/java/asm3.jar /usr/share/java/asm3-commons.jar"/>
       </manifest>
     </jar>
     <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />
Index: pkg-clojure/src/clj/clojure/core.clj
===================================================================
--- pkg-clojure.orig/src/clj/clojure/core.clj	2011-06-14 18:44:29.411349438 +0900
+++ pkg-clojure/src/clj/clojure/core.clj	2011-06-14 18:44:40.247125627 +0900
@@ -4299,10 +4299,10 @@
                    (.getAnnotation c java.lang.annotation.Retention)] 
           (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME)))))
 
-(defn- descriptor [^Class c] (clojure.asm.Type/getDescriptor c))
+(defn- descriptor [^Class c] (org.objectweb.asm.Type/getDescriptor c))
 
 (declare process-annotation)
-(defn- add-annotation [^clojure.asm.AnnotationVisitor av name v]
+(defn- add-annotation [^org.objectweb.asm.AnnotationVisitor av name v]
   (cond
    (vector? v) (let [avec (.visitArray av name)]
                  (doseq [vval v]
@@ -4312,7 +4312,7 @@
                  (cond 
                   (instance? java.lang.Enum ev)
                   (.visitEnum av name (descriptor (class ev)) (str ev))
-                  (class? ev) (.visit av name (clojure.asm.Type/getType ev))
+                  (class? ev) (.visit av name (org.objectweb.asm.Type/getType ev))
                   :else (throw (IllegalArgumentException. 
                                 (str "Unsupported annotation value: " v " of class " (class ev))))))
    (seq? v) (let [[nested nv] v
Index: pkg-clojure/src/clj/clojure/core_proxy.clj
===================================================================
--- pkg-clojure.orig/src/clj/clojure/core_proxy.clj	2011-06-14 18:44:29.435199626 +0900
+++ pkg-clojure/src/clj/clojure/core_proxy.clj	2011-06-14 18:44:40.247125627 +0900
@@ -11,9 +11,9 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (import
- '(clojure.asm ClassWriter ClassVisitor Opcodes Type) 
+ '(org.objectweb.asm ClassWriter ClassVisitor Opcodes Type) 
  '(java.lang.reflect Modifier Constructor)
- '(clojure.asm.commons Method GeneratorAdapter)
+ '(org.objectweb.asm.commons Method GeneratorAdapter)
  '(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT))
 
 (defn method-sig [^java.lang.reflect.Method meth]
Index: pkg-clojure/src/clj/clojure/genclass.clj
===================================================================
--- pkg-clojure.orig/src/clj/clojure/genclass.clj	2011-06-14 18:44:29.423466929 +0900
+++ pkg-clojure/src/clj/clojure/genclass.clj	2011-06-14 18:44:40.247125627 +0900
@@ -9,8 +9,8 @@
 (in-ns 'clojure.core)
 
 (import '(java.lang.reflect Modifier Constructor)
-        '(clojure.asm ClassWriter ClassVisitor Opcodes Type)
-        '(clojure.asm.commons Method GeneratorAdapter)
+        '(org.objectweb.asm ClassWriter ClassVisitor Opcodes Type)
+        '(org.objectweb.asm.commons Method GeneratorAdapter)
         '(clojure.lang IPersistentMap))
 
 ;(defn method-sig [^java.lang.reflect.Method meth]
Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java
===================================================================
--- pkg-clojure.orig/src/jvm/clojure/lang/Compiler.java	2011-06-14 18:44:29.403372045 +0900
+++ pkg-clojure/src/jvm/clojure/lang/Compiler.java	2011-06-14 18:44:40.247125627 +0900
@@ -12,17 +12,18 @@
 
 package clojure.lang;
 
-//*
+/*
 
 import clojure.asm.*;
 import clojure.asm.commons.Method;
 import clojure.asm.commons.GeneratorAdapter;
 //*/
-/*
+//*
 
 import org.objectweb.asm.*;
 import org.objectweb.asm.commons.Method;
 import org.objectweb.asm.commons.GeneratorAdapter;
+/*
 import org.objectweb.asm.util.TraceClassVisitor;
 import org.objectweb.asm.util.CheckClassAdapter;
 //*/
