Index: src/test/org/apache/lucene/analysis/kuromoji/TestKuromojiTokenizer.java
===================================================================
--- src/test/org/apache/lucene/analysis/kuromoji/TestKuromojiTokenizer.java	(revision 1232011)
+++ src/test/org/apache/lucene/analysis/kuromoji/TestKuromojiTokenizer.java	(working copy)
@@ -78,12 +78,17 @@
     );
   }
 
+  /* Note this is really a stupid test just to see if things arent horribly slow.
+   * ideally the test would actually fail instead of hanging...
+   */
   public void testDecomposition5() throws Exception {
-    assertAnalyzesTo(analyzer, "くよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよ",
-      new String[] { "くよくよ", "くよくよ", "くよくよ", "くよくよ", "くよくよ", "くよくよ", "くよくよ", "くよくよ", "くよくよ", "くよくよ" },
-      new int[] { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36},
-      new int[] { 4, 8, 12, 16, 20, 24, 28, 32, 36, 40 }
-    );
+    TokenStream ts = analyzer.tokenStream("bogus", new StringReader("くよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよくよ"));
+    ts.reset();
+    while (ts.incrementToken()) {
+      
+    }
+    ts.end();
+    ts.close();
   }
 
   /** Tests that sentence offset is incorporated into the resulting offsets */
Index: build.xml
===================================================================
--- build.xml	(revision 1232012)
+++ build.xml	(working copy)
@@ -25,10 +25,19 @@
 	
   <property name="build.dir" location="../build/kuromoji" />
   <property name="dist.dir" location="../dist/kuromoji" />
+
+  <!-- default configuration: uses mecab-ipadic -->
   <property name="ipadic.version" value="mecab-ipadic-2.7.0-20070801" />
   <property name="dict.src.file" value="${ipadic.version}.tar.gz" />
-  <!-- <property name="dict.url" value="http://atilika.com/releases/mecab-ipadic/${dict.src.file}" /> -->
   <property name="dict.url" value="http://mecab.googlecode.com/files/${dict.src.file}"/>
+
+  <!-- alternative configuration: uses mecab-naist-jdic
+  <property name="ipadic.version" value="mecab-naist-jdic-0.6.3b-20111013" />
+  <property name="dict.src.file" value="${ipadic.version}.tar.gz" />
+  <property name="dict.url" value="http://sourceforge.jp/frs/redir.php?m=iij&amp;f=/naist-jdic/53500/${dict.src.file}"/>
+  -->
+  
+  <property name="dict.src.file" value="${ipadic.version}.tar.gz" />
   <property name="dict.src.dir" value="${build.dir}/${ipadic.version}" />
   <property name="dict.encoding" value="euc-jp"/>
   <property name="dict.format" value="ipadic"/>