diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a729bfa50fa..83c003d8237 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -154,8 +154,8 @@ org.bouncycastle.version = 1.45
 /org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
 /org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
 
-/org.carrot2.attributes/attributes-binder = 1.2.0
-/org.carrot2/carrot2-mini = 3.8.0
+/org.carrot2.attributes/attributes-binder = 1.2.1
+/org.carrot2/carrot2-mini = 3.9.0
 
 org.carrot2.morfologik.version = 1.7.1
 /org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 38033a8e349..a00054cfa09 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -25,7 +25,7 @@ $Id$
 Versions of Major Components
 ---------------------
 Apache Tika 1.5
-Carrot2 3.8.0
+Carrot2 3.9.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
@@ -71,7 +71,7 @@ Other Changes
 Versions of Major Components
 ---------------------
 Apache Tika 1.5
-Carrot2 3.8.0
+Carrot2 3.9.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
@@ -184,6 +184,8 @@ Optimizations
 Other Changes
 ---------------------
 
+* SOLR-5909: Upgrade Carrot2 clustering dependency to 3.9.0. (Dawid Weiss)
+
 * SOLR-5764: Fix recently added tests to not use absolute paths to load test-files,
   use SolrTestCaseJ4.getFile() and getResource() instead; fix morphlines/map-reduce
   to not duplicate test resources and fix dependencies among them.
diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
index 2a55f65aec2..2a366f18fc1 100644
--- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
+++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
@@ -120,7 +120,7 @@ public class CarrotClusteringEngineTest extends AbstractClusteringTestCase {
 
   @Test
   public void testCarrotStc() throws Exception {
-    checkEngine(getClusteringEngine("stc"), 2);
+    checkEngine(getClusteringEngine("stc"), 3);
   }
 
   @Test
diff --git a/solr/licenses/attributes-binder-1.2.0.jar.sha1 b/solr/licenses/attributes-binder-1.2.0.jar.sha1
deleted file mode 100644
index 16318388090..00000000000
--- a/solr/licenses/attributes-binder-1.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2aa3ce620ebadea4e385fc0a54dc363cb659dca5
diff --git a/solr/licenses/attributes-binder-1.2.1.jar.sha1 b/solr/licenses/attributes-binder-1.2.1.jar.sha1
new file mode 100644
index 00000000000..d848184c47c
--- /dev/null
+++ b/solr/licenses/attributes-binder-1.2.1.jar.sha1
@@ -0,0 +1 @@
+d597da840c4f706a1b0bcf55935c6c30c0fbb5f2
diff --git a/solr/licenses/carrot2-mini-3.8.0.jar.sha1 b/solr/licenses/carrot2-mini-3.8.0.jar.sha1
deleted file mode 100644
index c190593a19a..00000000000
--- a/solr/licenses/carrot2-mini-3.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-65d7bbe49bad0a95d9ae9b858abafb96a666ac5a
diff --git a/solr/licenses/carrot2-mini-3.9.0.jar.sha1 b/solr/licenses/carrot2-mini-3.9.0.jar.sha1
new file mode 100644
index 00000000000..6698a979cd5
--- /dev/null
+++ b/solr/licenses/carrot2-mini-3.9.0.jar.sha1
@@ -0,0 +1 @@
+8eafc39444cd8d80802b2712d52ae751f3007cad