diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index e132b9ce5eb..6088388a465 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -156,7 +156,7 @@
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-c51112119be53a81e59706ce57bacaa90c052284.jar"/>
+	<classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index b86b77b61af..e1d885dfda6 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -216,9 +216,9 @@
         <version>1.2.7</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-langdetect</artifactId>
-        <version>${project.version}</version>
+        <groupId>com.cybozu.labs</groupId>
+        <artifactId>langdetect</artifactId>
+        <version>1.1-20120112</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
@@ -625,20 +625,6 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-install-plugin</artifactId>
             <executions>
-              <execution>
-                <id>install-langdetect</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>org.apache.solr</groupId>
-                  <artifactId>solr-langdetect</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>jar</packaging>
-                  <file>solr/contrib/langid/lib/langdetect-c51112119be53a81e59706ce57bacaa90c052284.jar</file>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
         </plugins>
diff --git a/dev-tools/maven/solr/contrib/langid/pom.xml.template b/dev-tools/maven/solr/contrib/langid/pom.xml.template
index fc5a8130a1c..516e7d10fe6 100644
--- a/dev-tools/maven/solr/contrib/langid/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/langid/pom.xml.template
@@ -76,8 +76,8 @@
       <artifactId>jsonic</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>solr-langdetect</artifactId>
+      <groupId>com.cybozu.labs</groupId>
+      <artifactId>langdetect</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>
diff --git a/solr/contrib/langid/build.xml b/solr/contrib/langid/build.xml
index 1b3cf573c59..68e09630791 100644
--- a/solr/contrib/langid/build.xml
+++ b/solr/contrib/langid/build.xml
@@ -31,12 +31,6 @@
     <path refid="solr.base.classpath"/>   
   </path>
 
-  <dirname file="${ant.file.solr-langid}" property="solr-langid.dir"/>
-  <target name="dist-maven" depends="common-solr.dist-maven">
-    <m2-deploy-with-pom-template pom.xml="${solr-langid.dir}/lib/langdetect-pom.xml.template"
-                                 jar.file="${solr-langid.dir}/lib/langdetect-c51112119be53a81e59706ce57bacaa90c052284.jar" />
-  </target>
-
     <!-- we don't actually need to compile this thing, we just want its libs -->
   <target name="resolve-extraction-libs">
     <ant dir="${common-solr.dir}/contrib/extraction" target="resolve" inheritAll="false">
diff --git a/solr/contrib/langid/ivy.xml b/solr/contrib/langid/ivy.xml
index a9375065bf6..b828b5a1c0e 100644
--- a/solr/contrib/langid/ivy.xml
+++ b/solr/contrib/langid/ivy.xml
@@ -19,9 +19,7 @@
 <ivy-module version="2.0">
     <info organisation="org.apache.solr" module="langid"/>
     <dependencies>
-      <dependency org="langdetect" name="langdetect" rev="c51112119be53a81e59706ce57bacaa90c052284">
-        <artifact name="langdetect" type="jar" url="http://language-detection.googlecode.com/git-history/c51112119be53a81e59706ce57bacaa90c052284/lib/langdetect.jar"/>
-      </dependency>
+      <dependency org="com.cybozu.labs" name="langdetect" rev="1.1-20120112" transitive="false"/>
       <dependency org="net.arnx" name="jsonic" rev="1.2.7" transitive="false"/>
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
     </dependencies>
diff --git a/solr/contrib/langid/lib/langdetect-pom.xml.template b/solr/contrib/langid/lib/langdetect-pom.xml.template
deleted file mode 100644
index 2f1af990d15..00000000000
--- a/solr/contrib/langid/lib/langdetect-pom.xml.template
+++ /dev/null
@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-  -->
-
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-parent</artifactId>
-    <version>@version@</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-langdetect</artifactId>
-  <name>Solr Specific langdetect</name>
-  <version>@version@</version>
-  <description>Solr Specific langdetect r111</description>
-  <packaging>jar</packaging>
-</project>