diff --git a/src/main/java/jp/sf/fess/ds/impl/IndexUpdateCallbackImpl.java b/src/main/java/jp/sf/fess/ds/impl/IndexUpdateCallbackImpl.java
index 2957996bc..c2393b0d2 100644
--- a/src/main/java/jp/sf/fess/ds/impl/IndexUpdateCallbackImpl.java
+++ b/src/main/java/jp/sf/fess/ds/impl/IndexUpdateCallbackImpl.java
@@ -22,6 +22,8 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
 import jp.sf.fess.FessSystemException;
+import jp.sf.fess.db.cbean.ClickLogCB;
+import jp.sf.fess.db.exbhv.ClickLogBhv;
 import jp.sf.fess.ds.IndexUpdateCallback;
 import jp.sf.fess.helper.CrawlingSessionHelper;
 
@@ -39,6 +41,10 @@ public class IndexUpdateCallbackImpl implements IndexUpdateCallback {
 
     public int maxDocumentCacheSize = 10;
 
+    public boolean clickCountEnabled = true;
+
+    public String clickCountField = "clickCount_i";
+
     protected volatile AtomicLong documentSize = new AtomicLong(0);
 
     protected volatile long commitPerCount = 0;
@@ -82,6 +88,10 @@ public class IndexUpdateCallbackImpl implements IndexUpdateCallback {
             doc.addField(entry.getKey(), entry.getValue());
         }
 
+        if (clickCountEnabled) {
+            addClickCountField(doc, dataMap.get("url").toString());
+        }
+
         docList.add(doc);
         if (logger.isDebugEnabled()) {
             logger.debug("Added the document. "
@@ -147,6 +157,19 @@ public class IndexUpdateCallbackImpl implements IndexUpdateCallback {
         docList.clear();
     }
 
+    protected void addClickCountField(final SolrInputDocument doc,
+            final String url) {
+        final ClickLogBhv clickLogBhv = SingletonS2Container
+                .getComponent(ClickLogBhv.class);
+        final ClickLogCB cb = new ClickLogCB();
+        cb.query().setUrl_Equal(url);
+        final int count = clickLogBhv.selectCount(cb);
+        doc.addField(clickCountField, count);
+        if (logger.isDebugEnabled()) {
+            logger.debug("Click Count: " + count + ", url: " + url);
+        }
+    }
+
     @Override
     public long getDocumentSize() {
         return documentSize.get();