diff --git a/build.gradle b/build.gradle
index a764126..3b2f24d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -141,7 +141,7 @@ subprojects {
             dependency 'ch.dissem.msgpack:msgpack:2.0.1'
             dependency 'org.bouncycastle:bcprov-jdk15on:1.57'
             dependency 'com.madgag.spongycastle:prov:1.56.0.0'
-            dependency 'org.apache.commons:commons-lang3:3.6'
+            dependency 'org.apache.commons:commons-text:1.1'
             dependency 'org.flywaydb:flyway-core:4.2.0'
             dependency 'com.beust:klaxon:0.31'
 
diff --git a/demo/build.gradle b/demo/build.gradle
index 3699414..9631b6f 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     compile 'org.slf4j:slf4j-simple'
     compile 'args4j:args4j'
     compile 'com.h2database:h2'
-    compile 'org.apache.commons:commons-lang3'
+    compile 'org.apache.commons:commons-text'
     testCompile 'junit:junit'
     testCompile 'com.nhaarman:mockito-kotlin'
 }
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index 50c2285..8ad5617 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -22,7 +22,7 @@ import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.extended.Message;
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;