diff --git a/pom.xml b/pom.xml
index 809838192..7c751c8a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <name>MessagePack for Java</name>
   <description>MessagePack for Java is a binary-based efficient object
       serialization library in Java.</description>
-  <version>0.6.9-SNAPSHOT</version>
+  <version>0.6.10-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <url>http://msgpack.org/</url>
 
diff --git a/src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java b/src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java
index 543cc7664..be423c512 100644
--- a/src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java
+++ b/src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java
@@ -21,6 +21,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javassist.ClassClassPath;
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.LoaderClassPath;
@@ -59,6 +60,7 @@ public JavassistTemplateBuilder(TemplateRegistry registry) {
     public JavassistTemplateBuilder(TemplateRegistry registry, ClassLoader cl) {
         super(registry);
         pool = new ClassPool();
+        pool.appendClassPath(new ClassClassPath(getClass()));
         boolean appended = false;
         loader = cl;
         if (loader == null) {